diff --git a/config.py b/config.py index cf2c91bf..7b7c4c27 100644 --- a/config.py +++ b/config.py @@ -530,10 +530,9 @@ class Config: def init_config(self): # Read Only self._VERSION = "2.0.0" - self._LOCAL_PATH = os_path.join(os_getenv('LOCALAPPDATA'), "VRCT") + self._LOCAL_PATH = os_path.dirname(sys.argv[0]) self._PATH_CONFIG = os_path.join(self._LOCAL_PATH, "config.json") self._PATH_LOGS = os_path.join(self._LOCAL_PATH, "logs") - os_makedirs(self._LOCAL_PATH, exist_ok=True) self._GITHUB_URL = "https://api.github.com/repos/misyaguziya/VRCT/releases/latest" self._BOOTH_URL = "https://misyaguziya.booth.pm/" self._DOCUMENTS_URL = "https://mzsoftware.notion.site/VRCT-Documents-be79b7a165f64442ad8f326d86c22246" diff --git a/installer/Install.nsi b/installer/Install.nsi index 5fcb57d6..5ee5b8bc 100644 --- a/installer/Install.nsi +++ b/installer/Install.nsi @@ -32,13 +32,13 @@ ShowInstDetails show ; 圧縮メソッド SetCompressor lzma ; インストールされるディレクトリ -InstallDir "$PROGRAMFILES\VRCT" +InstallDir "$LOCALAPPDATA\VRCT" ; XPマニフェスト XPStyle on ; ページ !insertmacro MUI_PAGE_WELCOME !insertmacro MUI_PAGE_LICENSE "..\LICENSE" -!insertmacro MUI_PAGE_DIRECTORY +;!insertmacro MUI_PAGE_DIRECTORY Page custom OptionPage OptionPageLeave !insertmacro MUI_PAGE_INSTFILES !insertmacro MUI_PAGE_FINISH @@ -132,7 +132,7 @@ Section ; 出力先を指定します。 SetOutPath "$INSTDIR" ; インストールされるファイル - File /r "..\dist\VRCT\" + File /r "..\dist\VRCT" ${If} $InstallDocs == ${BST_CHECKED} ; ドキュメントをインストールする場合 diff --git a/model.py b/model.py index 1be1ce9f..af1d3777 100644 --- a/model.py +++ b/model.py @@ -266,7 +266,7 @@ class Model: @staticmethod def updateSoftware(restart:bool=True): - filename = 'download.zip' + filename = 'VRCT.zip' program_name = 'VRCT.exe' temporary_name = '_VRCT.exe' tmp_directory_name = 'tmp' @@ -276,7 +276,8 @@ class Model: try: res = requests_get(config.GITHUB_URL) - url = res.json()['assets'][0]['browser_download_url'] + assets = res.json()['assets'][0]['browser_download_url'] + url = [i["browser_download_url"] for i in assets if i["name"] == filename][0] res = requests_get(url, stream=True) os_makedirs(os_path.join(current_directory, tmp_directory_name), exist_ok=True) with open(os_path.join(current_directory, tmp_directory_name, filename), 'wb') as file: