diff options
| -rw-r--r-- | EEHPH2.py | 2 | ||||
| -rw-r--r-- | cleanup.exe | bin | 0 -> 5393961 bytes | |||
| -rw-r--r-- | cleanup/cleanup.py | 7 | ||||
| -rw-r--r-- | cleanup/icon.ico | bin | 0 -> 31020 bytes | |||
| -rw-r--r-- | inno/EEHPH2_installer.exe | bin | 0 -> 16983940 bytes | |||
| -rw-r--r-- | on_install_setup.exe | bin | 5390432 -> 5390627 bytes | |||
| -rw-r--r-- | on_install_setup/on_install_setup.py | 2 | ||||
| -rw-r--r-- | setup.iss | 7 | ||||
| -rw-r--r-- | setup.py | 1 |
9 files changed, 16 insertions, 3 deletions
@@ -2,7 +2,7 @@ import sys import os def find_location(): - filelocation = os.path.join(os.getenv("LOCALAPPDATA"), "EEPHPH2", "location.txt") + filelocation = os.path.join(os.environ['ALLUSERSPROFILE'], "EEHPH2", "location.txt") file = open(filelocation, "r") applocation = file.readline() file.close() diff --git a/cleanup.exe b/cleanup.exe Binary files differnew file mode 100644 index 0000000..dca106d --- /dev/null +++ b/cleanup.exe diff --git a/cleanup/cleanup.py b/cleanup/cleanup.py new file mode 100644 index 0000000..4ba20bc --- /dev/null +++ b/cleanup/cleanup.py @@ -0,0 +1,7 @@ +import shutil +import os + +try: + shutil.rmtree(os.path.join(os.environ["ALLUSERSPROFILE"], "EEHPH2")) +except: + pass
\ No newline at end of file diff --git a/cleanup/icon.ico b/cleanup/icon.ico Binary files differnew file mode 100644 index 0000000..b81e427 --- /dev/null +++ b/cleanup/icon.ico diff --git a/inno/EEHPH2_installer.exe b/inno/EEHPH2_installer.exe Binary files differnew file mode 100644 index 0000000..9126c08 --- /dev/null +++ b/inno/EEHPH2_installer.exe diff --git a/on_install_setup.exe b/on_install_setup.exe Binary files differindex 4dace3a..45d0c10 100644 --- a/on_install_setup.exe +++ b/on_install_setup.exe diff --git a/on_install_setup/on_install_setup.py b/on_install_setup/on_install_setup.py index a8791aa..56c961d 100644 --- a/on_install_setup/on_install_setup.py +++ b/on_install_setup/on_install_setup.py @@ -3,7 +3,7 @@ import os location = sys.argv[1] -appdata = os.path.join(os.getenv("LOCALAPPDATA"), "EEPHPH2") +appdata = os.path.join(os.environ['ALLUSERSPROFILE'], "EEHPH2") if not os.path.exists(appdata): os.mkdir(appdata) @@ -1,5 +1,5 @@ #define MyAppName "EEHPH Photo Viewer v2" -#define MyAppVersion "2.0.1" +#define MyAppVersion "2.1.1" #define MyAppPublisher "AE Computer Vision" #define MyAppURL "https://aecomputervision.blogspot.co.uk/" #define MyAppExeName "EEHPH2.exe" @@ -36,6 +36,7 @@ Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\EEH Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\EEHPH2_app.py"; DestDir: "{app}"; Flags: ignoreversion Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\LICENSE.txt"; DestDir: "{app}"; Flags: ignoreversion Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\on_install_setup.exe"; DestDir: "{app}"; Flags: ignoreversion +Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\cleanup.exe"; DestDir: "{app}"; Flags: ignoreversion Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\python36.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\tcl86t.dll"; DestDir: "{app}"; Flags: ignoreversion Source: "C:\Users\Edward\Documents\workingdir\eehph2\build\exe.win-amd64-3.6\tk86t.dll"; DestDir: "{app}"; Flags: ignoreversion @@ -54,3 +55,7 @@ Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: Filename: "{app}\on_install_setup.exe"; Parameters: """{app}\" Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent +[UninstallRun] +Filename: "{app}\cleanup.exe"; + + @@ -12,6 +12,7 @@ include_files = [ "Assets\\", "LICENSE.txt", "on_install_setup.exe", + "cleanup.exe", "EEHPH2_app.py", r"C:\Program Files (x86)\Python36_64\DLLs\tcl86t.dll", r"C:\Program Files (x86)\Python36_64\DLLs\tk86t.dll", |