Skip to content

Commit 1b1d64b

Browse files
committed
simplify upgrade octoprint batch
1 parent 8314931 commit 1b1d64b

File tree

2 files changed

+2
-15
lines changed

2 files changed

+2
-15
lines changed

OctoPrint Setup.iss

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -476,19 +476,6 @@ begin
476476
end;
477477
end;
478478
479-
procedure update_batch_upgrader();
480-
var
481-
UnicodeStr: string;
482-
ANSIStr: AnsiString;
483-
begin
484-
if LoadStringFromFile(ExpandConstant('{app}\upgrade_octoprint.bat'), ANSIStr) then
485-
begin
486-
UnicodeStr := String(ANSIStr);
487-
StringChangeEx(UnicodeStr, '####EXEPATH####', ExpandConstant('{app}\WPy64-31700\scripts\python.bat'), True)
488-
SaveStringToFile(ExpandConstant('{app}\upgrade_octoprint.bat'), AnsiString(UnicodeStr), False);
489-
end;
490-
end;
491-
492479
procedure RegisterPreviousData(PreviousDataKey: Integer);
493480
begin
494481
{ Store the settings so we can restore them next time }
@@ -557,7 +544,7 @@ Source: "WPy64-31700\*"; DestDir: "{app}\WPy64-31700"; Flags: recursesubdirs cre
557544
Source: "OctoPrint.ico"; DestDir: "{app}"; Flags: uninsneveruninstall; Components: initial_instance
558545
Source: "OctoPrintService.exe"; DestDir: "{app}"; Components: initial_instance add_instance; AfterInstall: rename_service_wrapper
559546
Source: "OctoPrintService.xml"; DestDir: "{app}"; Flags: ignoreversion; Components: initial_instance add_instance; AfterInstall: update_service_config
560-
Source: "upgrade_octoprint.bat"; DestDir: "{app}"; Flags: ignoreversion uninsneveruninstall; Components: initial_instance; AfterInstall: update_batch_upgrader
547+
Source: "upgrade_octoprint.bat"; DestDir: "{app}"; Flags: ignoreversion uninsneveruninstall; Components: initial_instance
561548
Source: "config.yaml"; DestDir: "{app}"; Flags: ignoreversion; Components: initial_instance add_instance; AfterInstall: rename_config
562549
Source: "ffmpeg.exe"; DestDir: "{app}"; Flags: ignoreversion uninsneveruninstall; Tasks: include_ffmpeg include_go2rtc; AfterInstall: update_config_ffmpeg
563550
Source: "yawcam_install.exe"; DestDir: "{app}"; Components: initial_instance; Tasks: include_yawcam; AfterInstall: update_config_yawcam

upgrade_octoprint.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ cls
3535
@echo !!! !!!
3636
@echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
3737
@echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
38-
call "####EXEPATH####" -m pip install --upgrade octoprint
38+
call "%~dp0\WPy64-31700\scripts\python.bat" -m pip install --upgrade octoprint
3939
@echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
4040
@echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
4141
@echo !!! !!!

0 commit comments

Comments
 (0)