operate within the subfolder 'install_data', rather than in the root …

…directory, to keep the folder clean.
07th-mod · Feb 19, 2019 · 64f3b4a · 64f3b4a
1 parent 5c908e2
commit 64f3b4a
Show file tree

Hide file tree

Showing 15 changed files with 11 additions and 9 deletions.
diff --git a/bootstrap/higu_linux64_installer/install b/bootstrap/higu_linux64_installer/install
@@ -1,6 +1,6 @@
 #!/bin/sh
 cd "$(dirname "$0")"
+cd install_data
 ./.aria2c --allow-overwrite=true --auto-file-renaming=false https://raw.githubusercontent.com/07th-mod/python-patcher/master/scriptDownloadList.txt
-./.aria2c --allow-overwrite=true --auto-file-renaming=false --input-file=scriptDownloadList.txt --dir=scripts
-rm scriptDownloadList.txt
-python ./scripts/main.py
+./.aria2c --allow-overwrite=true --auto-file-renaming=false --input-file=scriptDownloadList.txt
+python ./main.py
diff --git a/bootstrap/higu_linux64_installer/.7za → .../higu_linux64_installer/install_data/.7za b/bootstrap/higu_linux64_installer/.7za → .../higu_linux64_installer/install_data/.7za
diff --git a/bootstrap/higu_linux64_installer/.aria2c → ...gu_linux64_installer/install_data/.aria2c b/bootstrap/higu_linux64_installer/.aria2c → ...gu_linux64_installer/install_data/.aria2c
diff --git a/bootstrap/higu_win_installer/install.bat b/bootstrap/higu_win_installer/install.bat
@@ -1,9 +1,10 @@
 @echo off
+cd install_data
 IF NOT EXIST "python/python.exe" 7za x -aoa python_archive.7z
 aria2c --allow-overwrite=true --auto-file-renaming=false https://raw.githubusercontent.com/07th-mod/python-patcher/master/scriptDownloadList.txt
-aria2c --allow-overwrite=true --auto-file-renaming=false --input-file=scriptDownloadList.txt --dir=scripts
-del scriptDownloadList.txt
-"python/python.exe" scripts/main.py
+aria2c --allow-overwrite=true --auto-file-renaming=false --input-file=scriptDownloadList.txt
+"python/python.exe" main.py
+
 echo ----------------------------------------------------------- 
 echo ------------ Batch file has finished executing ------------
 echo ------------ Press any key to close this window -----------  

diff --git a/bootstrap/higu_win_installer/7za.dll → ...p/higu_win_installer/install_data/7za.dll b/bootstrap/higu_win_installer/7za.dll → ...p/higu_win_installer/install_data/7za.dll
diff --git a/bootstrap/higu_win_installer/7za.exe → ...p/higu_win_installer/install_data/7za.exe b/bootstrap/higu_win_installer/7za.exe → ...p/higu_win_installer/install_data/7za.exe
diff --git a/bootstrap/higu_win_installer/7zxa.dll → .../higu_win_installer/install_data/7zxa.dll b/bootstrap/higu_win_installer/7zxa.dll → .../higu_win_installer/install_data/7zxa.dll
diff --git a/bootstrap/higu_win_installer/aria2c.exe → ...igu_win_installer/install_data/aria2c.exe b/bootstrap/higu_win_installer/aria2c.exe → ...igu_win_installer/install_data/aria2c.exe
diff --git a/...trap/higu_win_installer/python_archive.7z → ..._installer/install_data/python_archive.7z b/...trap/higu_win_installer/python_archive.7z → ..._installer/install_data/python_archive.7z
diff --git a/bootstrap/higu_win_installer_32/install.bat b/bootstrap/higu_win_installer_32/install.bat
@@ -1,9 +1,10 @@
 @echo off
+cd install_data
 IF NOT EXIST "python/python.exe" 7za x -aoa python_archive.7z
 aria2c --allow-overwrite=true --auto-file-renaming=false https://raw.githubusercontent.com/07th-mod/python-patcher/master/scriptDownloadList.txt
-aria2c --allow-overwrite=true --auto-file-renaming=false --input-file=scriptDownloadList.txt --dir=scripts
-del scriptDownloadList.txt
-"python/python.exe" scripts/main.py
+aria2c --allow-overwrite=true --auto-file-renaming=false --input-file=scriptDownloadList.txt
+"python/python.exe" main.py
+
 echo ----------------------------------------------------------- 
 echo ------------ Batch file has finished executing ------------
 echo ------------ Press any key to close this window -----------  

diff --git a/bootstrap/higu_win_installer_32/7za.dll → ...igu_win_installer_32/install_data/7za.dll b/bootstrap/higu_win_installer_32/7za.dll → ...igu_win_installer_32/install_data/7za.dll
diff --git a/bootstrap/higu_win_installer_32/7za.exe → ...igu_win_installer_32/install_data/7za.exe b/bootstrap/higu_win_installer_32/7za.exe → ...igu_win_installer_32/install_data/7za.exe
diff --git a/bootstrap/higu_win_installer_32/7zxa.dll → ...gu_win_installer_32/install_data/7zxa.dll b/bootstrap/higu_win_installer_32/7zxa.dll → ...gu_win_installer_32/install_data/7zxa.dll
diff --git a/bootstrap/higu_win_installer_32/aria2c.exe → ..._win_installer_32/install_data/aria2c.exe b/bootstrap/higu_win_installer_32/aria2c.exe → ..._win_installer_32/install_data/aria2c.exe
diff --git a/...p/higu_win_installer_32/python_archive.7z → ...staller_32/install_data/python_archive.7z b/...p/higu_win_installer_32/python_archive.7z → ...staller_32/install_data/python_archive.7z