From f062d040e339f99033fa6668e6257c30c9d23cd9 Mon Sep 17 00:00:00 2001
From: jwansek <eddie.atten.ea29@gmail.com>
Date: Thu, 19 Apr 2018 13:31:57 +0100
Subject: added manual setup script for .zip installs

---
 .gitignore                   |   3 +++
 .vs/ProjectSettings.json     |   3 +++
 .vs/VSWorkspaceState.json    |   7 +++++++
 .vs/eehph2/v15/.suo          | Bin 0 -> 11264 bytes
 .vs/slnx.sqlite              | Bin 0 -> 233472 bytes
 inno/EEHPH2_installer.exe    | Bin 16945022 -> 16949444 bytes
 manual_setup.exe             | Bin 0 -> 5393269 bytes
 manual_setup/icon.ico        | Bin 0 -> 31020 bytes
 manual_setup/manual_setup.py |  19 +++++++++++++++++++
 setup.iss                    |   2 +-
 setup.py                     |   3 ++-
 11 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 .vs/ProjectSettings.json
 create mode 100644 .vs/VSWorkspaceState.json
 create mode 100644 .vs/eehph2/v15/.suo
 create mode 100644 .vs/slnx.sqlite
 create mode 100644 manual_setup.exe
 create mode 100644 manual_setup/icon.ico
 create mode 100644 manual_setup/manual_setup.py

diff --git a/.gitignore b/.gitignore
index 6dc7749..1ef3492 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,9 @@ on_install_setup/__pycache__/
 cleanup/build/
 cleanup/dist/
 cleanup/__pycache__/
+manual_setup/build/
+manual_setup/dist/
+manual_setup/__pycache__/
 
 #stuff below here is a template
 # Byte-compiled / optimized / DLL files
diff --git a/.vs/ProjectSettings.json b/.vs/ProjectSettings.json
new file mode 100644
index 0000000..f8b4888
--- /dev/null
+++ b/.vs/ProjectSettings.json
@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}
\ No newline at end of file
diff --git a/.vs/VSWorkspaceState.json b/.vs/VSWorkspaceState.json
new file mode 100644
index 0000000..c507a06
--- /dev/null
+++ b/.vs/VSWorkspaceState.json
@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\EEHPH2_app.py",
+  "PreviewInSolutionExplorer": false
+}
\ No newline at end of file
diff --git a/.vs/eehph2/v15/.suo b/.vs/eehph2/v15/.suo
new file mode 100644
index 0000000..bc8131e
Binary files /dev/null and b/.vs/eehph2/v15/.suo differ
diff --git a/.vs/slnx.sqlite b/.vs/slnx.sqlite
new file mode 100644
index 0000000..8a97df7
Binary files /dev/null and b/.vs/slnx.sqlite differ
diff --git a/inno/EEHPH2_installer.exe b/inno/EEHPH2_installer.exe
index 7ff4104..638cc0d 100644
Binary files a/inno/EEHPH2_installer.exe and b/inno/EEHPH2_installer.exe differ
diff --git a/manual_setup.exe b/manual_setup.exe
new file mode 100644
index 0000000..2399c43
Binary files /dev/null and b/manual_setup.exe differ
diff --git a/manual_setup/icon.ico b/manual_setup/icon.ico
new file mode 100644
index 0000000..b81e427
Binary files /dev/null and b/manual_setup/icon.ico differ
diff --git a/manual_setup/manual_setup.py b/manual_setup/manual_setup.py
new file mode 100644
index 0000000..59fc2da
--- /dev/null
+++ b/manual_setup/manual_setup.py
@@ -0,0 +1,19 @@
+import os
+
+location = input("Please copy in the path of the installation directory: ")
+appdata = os.path.join(os.environ['ALLUSERSPROFILE'], "EEHPH2")
+
+try:
+    if not os.path.exists(appdata):
+        os.mkdir(appdata)
+
+    file = open(os.path.join(appdata, "location.txt"), "w")
+    file.write(location)
+    file.close()
+
+    print("location saved to %s. You can change it by running this program again." % location)
+    
+except PermissionError as e:
+    print("Failed because of insufficeint permissions. Try running as admin. Error:[%s]" % e)
+
+input("Press any key to close...")
\ No newline at end of file
diff --git a/setup.iss b/setup.iss
index c5acb67..81a4e3f 100644
--- a/setup.iss
+++ b/setup.iss
@@ -1,5 +1,5 @@
 #define MyAppName "EEHPH Photo Viewer v2"
-#define MyAppVersion "2.2.5"
+#define MyAppVersion "2.2.6"
 #define MyAppPublisher "AE Computer Vision"
 #define MyAppURL "https://aecomputervision.blogspot.co.uk/"
 #define MyAppExeName "EEHPH2.exe"
diff --git a/setup.py b/setup.py
index 733a66d..c29675b 100644
--- a/setup.py
+++ b/setup.py
@@ -13,6 +13,7 @@ include_files = [
     "LICENSE.txt",
     "on_install_setup.exe",
     "cleanup.exe",
+    "manual_setup.exe",
     "EEHPH2_app.py",
     r"C:\Program Files (x86)\Python36_64\DLLs\tcl86t.dll",
     r"C:\Program Files (x86)\Python36_64\DLLs\tk86t.dll",
@@ -27,7 +28,7 @@ exec_ = Executable(
 setup(
     name = "EEHPH Photo Viewer v2",
     options = {"build_exe": {"packages": packages, "include_files": include_files}},
-    version = "2.2.5",
+    version = "2.2.6",
     description = "EEHPH2 by AE computer vision",
     author = "Edward Attenborough",
     executables = [exec_]
-- 
cgit v1.2.3