diff --git a/packages/linux.sh b/packages/linux.sh index 51ba307db3353ad4ae86e14672160518cdf086aa..3ee2eeaa68849c56f93b4638783f5ce7544db32b 100755 --- a/packages/linux.sh +++ b/packages/linux.sh @@ -29,7 +29,7 @@ echo " *** MAKE PACKAGE" OLD_PWD=$PWD cd dist/ -tar --xz -cf pamhyr-gnulinux-amd64.tar.xz pamhyr +tar --xz -cf pamhyr-gnulinux-amd64.tar.xz pamhyr --checkpoint=.100 cd $OLD_PWD mv dist/pamhyr-gnulinux-amd64.tar.xz ./ diff --git a/packages/wine.sh b/packages/wine.sh index 0c1b30ff20f74ff6bc9963b687472b9907b832f6..04a68aa8b39a57c21b27035ae2a857d4619329e3 100755 --- a/packages/wine.sh +++ b/packages/wine.sh @@ -7,10 +7,17 @@ export WINARCH=win64 if [ -z $WINEPREFIX ]; then # FIXME Not tested yet... - export WINEPREFIX=./wine-pamhyr-build + export WINEPREFIX=$(realpath ./wine-pamhyr-build) - wget https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe - wget https://freefr.dl.sourceforge.net/project/nsis/NSIS%203/3.08/nsis-3.08-setup.exe + if [ ! -f python-3.8.10-amd64.exe ]; + then + wget https://www.python.org/ftp/python/3.8.10/python-3.8.10-amd64.exe + fi + + if [ ! -f nsis-3.08-setup.exe ]; + then + wget https://freefr.dl.sourceforge.net/project/nsis/NSIS%203/3.08/nsis-3.08-setup.exe + fi # Dummy display Xvfb :42 -screen 0 1024x768x16 & @@ -22,14 +29,28 @@ then 7zip \ win10 - DISPLAY=:42.0 wine cmd /c python-3.8.10-amd64.exe /quiet PrependPath=1 - wine python $WINEPREFIX/drive_c/Program\ Files/Python38/Tools/scripts/win_add2path.py + echo " *** PYTHON INSTALL" + if [ ! -f $WINEPREFIX/drive_c/Program Files/Python38/python.exe ]; + then + #DISPLAY=:42.0 wine cmd /c python-3.8.10-amd64.exe /quiet PrependPath=1 + wine cmd /c python-3.8.10-amd64.exe PrependPath=1 + wine python $WINEPREFIX/drive_c/Program\ Files/Python38/Tools/scripts/win_add2path.py + fi + + echo " *** PIP UPGRADE AND DEPENDENCIES" + wine python -m pip install --upgrade pip wine python -m pip install pyinstaller - DISPLAY=:42.0 wine cmd /c nsis-3.08-setup.exe /quiet + + echo " *** NSIS INSTALL" + if [ ! -f $WINEPREFIX/drive_c/Program\ Files\ \(x86\)/NSIS/makensis.exe ]; + then + wine cmd /c nsis-3.08-setup.exe + fi fi echo " *** PYINSTALL" +wine python -m pip install -r $(realpath ../requirements.txt) wine pyinstaller ../src/pamhyr.py -y echo " *** COPY DATA" @@ -48,7 +69,7 @@ echo " TAR pamhyr-win-amd64.tar.xz" OLD_PWD=$PWD cd dist/ -tar --xz -cf pamhyr-win-amd64.tar.xz pamhyr +tar --xz -cf pamhyr-win-amd64.tar.xz pamhyr --checkpoint=.100 cd $OLD_PWD mv dist/pamhyr-win-amd64.tar.xz ./