From fdfc5dd04e5d437b3c3509fea5ef4c1ddea5f228 Mon Sep 17 00:00:00 2001 From: Joey Payne Date: Tue, 9 Feb 2016 09:05:03 -0700 Subject: [PATCH] Fixed linux build and removed another reference to NW.js. --- build_command_line_linux.bash | 7 +++---- command_line.py | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build_command_line_linux.bash b/build_command_line_linux.bash index ad32a2c..33daf35 100755 --- a/build_command_line_linux.bash +++ b/build_command_line_linux.bash @@ -1,16 +1,15 @@ -rm -rf ElectrifyLinux*.zip -rm -rf ElectrifyLinux-CMD +rm -rf build ElectrifyLinux* VERSION=$(cat files/version.txt) -pyinstaller --onefile --exclude-module PyQt5 --exclude-module PyQt4 --hidden-import PIL.Jpeg2KImagePlugin --hidden-import pkg_resources --hidden-import PIL._imaging --hidden-import configobj --distpath ElectrifyLinux-CMD -n electrify-linux command_line.py +pyinstaller --onefile --exclude-module PyQt5 --exclude-module PyQt4 --hidden-import PIL._imaging --hidden-import PIL.Jpeg2KImagePlugin --hidden-import pkg_resources --hidden-import PIL._imaging --hidden-import configobj --distpath ElectrifyLinux-CMD -n electrify-linux command_line.py cp -rf files ElectrifyLinux-CMD/files rm -rf ElectrifyLinux-CMD/files/downloads/* rm ElectrifyLinux-CMD/files/error.log ElectrifyLinux-CMD/files/last_project_path.txt ElectrifyLinux-CMD/files/recent_files.txt ElectrifyLinux-CMD/files/compressors/upx-mac ElectrifyLinux-CMD/files/compressors/upx-win.exe rm -rf ElectrifyLinux -pyinstaller -F --exclude-module PyQt5 --exclude-module PyQt4 --hidden-import PIL.Jpeg2KImagePlugin --hidden-import configobj --hidden-import PIL._imaging --hidden-import pkg_resources -n electrify --distpath ElectrifyLinux main.py +pyinstaller -F --exclude-module PyQt5 --exclude-module PyQt4 --hidden-import PIL._imaging --hidden-import PIL.Jpeg2KImagePlugin --hidden-import configobj --hidden-import PIL._imaging --hidden-import pkg_resources -n electrify --distpath ElectrifyLinux main.py cp -rf files ElectrifyLinux/files rm -rf ElectrifyLinux/files/downloads/* rm ElectrifyLinux/files/error.log ElectrifyLinux/files/last_project_path.txt ElectrifyLinux/files/recent_files.txt ElectrifyLinux/files/compressors/upx-mac ElectrifyLinux/files/compressors/upx-win.exe diff --git a/command_line.py b/command_line.py index 5195edc..a715b2f 100644 --- a/command_line.py +++ b/command_line.py @@ -275,7 +275,7 @@ class CommandBase(object): self.setup_electron_versions() def update_electron_versions(self, button): - self.progress_text = 'Updating nw versions...' + self.progress_text = 'Updating electron versions...' self.get_versions() self.progress_text = '\nDone.\n'