Skip to content

Commit ce120e0

Browse files
committed
Drop old py2 to py3 script handler
1 parent c0cbde5 commit ce120e0

2 files changed

Lines changed: 2 additions & 53 deletions

File tree

lib/python/qtvcp/designer/install_script

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -82,35 +82,9 @@ fi
8282
echo -e '\ncreate plugin link at:\n~/.designer/plugins/python/\n'
8383
ln -s "$pifile" ~/.designer/plugins/python/
8484

85-
arch=$(uname -m)
86-
sopath=/usr/lib/$arch-linux-gnu/qt5/plugins/designer/
87-
p2sofile=libpyqt5_py2.so
88-
p3sofile=libpyqt5.so
89-
90-
# ensure we have a python3 .so file
91-
if [ ! -f "$sopath/$p3sofile" ]; then
92-
# check if we have a python3 .so backup file from a python2 installation
93-
if [ -f "$sopath/$p3sofile.old" ]; then
94-
echo -e '\nrename libpyqt5.so.old file to libpyqt5.so'
95-
sudo mv "$sopath/$p3sofile.old" "$sopath/$p3sofile"
96-
# otherwise report an error
97-
else
98-
echo -e '\nlibpyqt5.so is missing from:'
99-
echo -e '/usr/lib/x86_64-linux-gnu/qt5/plugins/designer/'
100-
echo -e '\ndesigner installation aborted...\n'
101-
exit
102-
fi
103-
fi
104-
105-
# remove python2 .so file if it exists
106-
if [ -f "$sopath/$p2sofile" ]; then
107-
echo -e '\nremove python2 .so file'
108-
sudo rm "$sopath/$p2sofile"
109-
fi
110-
11185
#clear
11286
echo -e '\nInstallation complete, designer can be started with:'
113-
echo -e '\ndesigner -qt=5\n'
87+
echo -e '\ndesigner -qt=6\n'
11488
if [ "$response" -eq 2 ]; then
11589
echo -e 'After setting the rip-environment\n'
11690
fi

scripts/setup_designer.in

Lines changed: 1 addition & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -82,34 +82,9 @@ fi
8282
echo -e '\ncreate plugin link at:\n~/.designer/plugins/python/\n'
8383
ln -s "$pifile" ~/.designer/plugins/python/
8484

85-
sopath=/usr/lib/x86_64-linux-gnu/qt5/plugins/designer/
86-
p2sofile=libpyqt5_py2.so
87-
p3sofile=libpyqt5.so
88-
89-
# ensure we have a python3 .so file
90-
if [ ! -f $sopath/$p3sofile ]; then
91-
# check if we have a python3 .so backup file from a python2 installation
92-
if [ -f $sopath/$p3sofile.old ]; then
93-
echo -e '\nrename libpyqt5.so.old file to libpyqt5.so'
94-
sudo mv $sopath/$p3sofile.old $sopath/$p3sofile
95-
# otherwise report an error
96-
else
97-
echo -e '\nlibpyqt5.so is missing from:'
98-
echo -e '/usr/lib/x86_64-linux-gnu/qt5/plugins/designer/'
99-
echo -e '\ndesigner installation aborted...\n'
100-
exit
101-
fi
102-
fi
103-
104-
# remove python2 .so file if it exists
105-
if [ -f $sopath/$p2sofile ]; then
106-
echo -e '\nremove python2 .so file'
107-
sudo rm $sopath/$p2sofile
108-
fi
109-
11085
#clear
11186
echo -e '\nInstallation complete, designer can be started with:'
112-
echo -e '\ndesigner -qt=5\n'
87+
echo -e '\ndesigner -qt=6\n'
11388
if [ "$response" -eq 2 ]; then
11489
echo -e 'After setting the rip-environment\n'
11590
fi

0 commit comments

Comments
 (0)