Merge pull request #5 from Nigh/c-updater

rewrite updater with C

.gitignore

@@ -18,3 +18,6 @@ dist/
 
 *.ini
 compile_prop.ahk
+
+*.exe
+*.zip

README.md

@@ -24,7 +24,8 @@ Then the script would download the file and check if there is newer version. If
 
 - set `version`
 - set `ahkFilename` to your script name, it would compile `%ahkFilename%.ahk` to `%binaryFilename%.exe`
-- set `downloadUrl` to your github release URL
+- ~~set `downloadUrl` to your github release URL~~
+- set your GitHub id(`GitHubID`) and Repo name (`repoName`)
 
 ### `tray.ahk`
 

distribution.ahk

@@ -45,11 +45,11 @@ DirCreate("dist")
 
 try
 {
- RunWait("./ahk-compile-toolset/ahk2exe.exe /in updater.ahk /out updater.exe /base `"" A_AhkPath "`" /compress 1")
+ RunWait("./ahk-compile-toolset/tcc/tcc.exe ./updater.c -luser32")
 }
 catch as e
 {
- MsgBox("updater.ahk`nERROR CODE=" . e.Message)
+ MsgBox("updater compile`nERROR CODE=" . e.Message)
  ExitApp
 }
 

meta.ahk

@@ -1,14 +1,14 @@
 FileEncoding("UTF-8")
 appName := "auto upgrader"
-version := "0.3.4"
+version := "0.4.0"
 versionFilename := "version.txt"
 ahkFilename := "app.ahk"
 binaryFilename := "app.exe"
 downloadFilename := "app.zip"
-downloadUrl := "/Nigh/ahk-autoupdate-template/releases/latest/download/"
+GitHubID := "Nigh"
+repoName := "ahk-autoupdate-template"
+downloadUrl := "/" GitHubID "/" repoName "/releases/latest/download/"
 update_log := "
 (
-Replaced compiler binary source
-Removed dead GitHub mirror
-Fixed property set in the compiled executable's version information
+Rewrite updater.ahk with C, that will reduce the compiled binary by half.
 )"

update.ahk

@@ -1,7 +1,14 @@
 #include meta.ahk
 
 if FileExist("updater.exe") {
- FileDelete("updater.exe")
+ try {
+ FileDelete("updater.exe")
+ }
+}
+if FileExist("___delete_me___.exe") {
+ try {
+ FileDelete("___delete_me___.exe")
+ }
 }
 if !FileExist("setting.ini") {
  IniWrite(version, "setting.ini", "update", "ver")
@@ -108,7 +115,7 @@ updateReady() {
  MsgBox("Download finished`nProgram will restart now", , "T3")
  todayUpdated()
  FileInstall("updater.exe", "updater.exe", 1)
- Run("updater.exe")
+ Run("updater.exe ___ORIGIN_ME___ " downloadFilename " " binaryFilename, A_ScriptDir, "Hide")
  ExitApp
  } catch as e {
  TrayTip "An exception was thrown!`nSpecifically: " . e.Message, "upgrade failed", 0x3

updater.c

@@ -0,0 +1,99 @@
+
+#include <process.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <tchar.h>
+#include <windows.h>
+#include <winuser.h>
+
+#define ORIGIN_ME "___ORIGIN_ME___"
+#define KILL_ME "___KILL_ME___"
+#define DELETE_ME "___delete_me___.exe"
+
+// USAGE:
+// .\updater.exe ___ORIGIN_ME___ app.zip app.exe
+
+// Compile:
+// tcc .\updater.c -luser32
+
+void unzip(const char *path) {
+ TCHAR wpath[128];
+ TCHAR cmd[128];
+
+ sprintf(wpath, "%s", path);
+ sprintf(cmd, "powershell -command \"Expand-Archive -Force %s .\"", path);
+ printf("cmd=%s\n", cmd);
+ printf("Sleep 200ms\n");
+ Sleep(200);
+ system(cmd);
+ DeleteFile(wpath);
+}
+
+void runNewBinary(const char *path) {
+ TCHAR cmd[128];
+ STARTUPINFO si = {sizeof(si)};
+ PROCESS_INFORMATION pi;
+ sprintf(cmd, "%s", path);
+ CreateProcess(NULL, cmd, NULL, NULL, FALSE, 0, NULL, NULL, &si, &pi);
+}
+
+void cloneSelf() {
+ TCHAR selfPath[_MAX_PATH];
+ GetModuleFileName(NULL, selfPath, _MAX_PATH);
+ printf("%d = Copy %s to %s\n", CopyFile(selfPath, DELETE_ME, FALSE), selfPath, DELETE_ME);
+ HANDLE hfile = CreateFile(DELETE_ME, 0, FILE_SHARE_READ, NULL, OPEN_EXISTING, FILE_FLAG_DELETE_ON_CLOSE, NULL);
+ printf("HANDLE(%d) = Create %s in FILE_FLAG_DELETE_ON_CLOSE\n", hfile, DELETE_ME);
+ HANDLE hProcessOrig = OpenProcess(SYNCHRONIZE, TRUE, GetCurrentProcessId());
+ printf("Origin HANDLE = %d\n", hProcessOrig);
+
+ // Create clone process
+ TCHAR cmd[256];
+ wsprintf(cmd, __T("%s " KILL_ME " %d \"%s\""), DELETE_ME, hProcessOrig, selfPath);
+ printf("%s\n", cmd);
+ STARTUPINFO si;
+ ZeroMemory(&si, sizeof(si));
+ si.cb = sizeof(si);
+ PROCESS_INFORMATION pi;
+ CreateProcess(NULL, cmd, NULL, NULL, TRUE, 0, NULL, NULL, &si, &pi);
+
+ printf("Close(%d)\n", hProcessOrig);
+ CloseHandle(hProcessOrig);
+ printf("Close(%d)\n", hfile);
+ CloseHandle(hfile);
+}
+
+void delete_original(const char *handle, const char *path) {
+ HANDLE hProcessOrig = (HANDLE)_ttoi(handle);
+ printf("[k]Wait(%d)\n", hProcessOrig);
+ WaitForSingleObject(hProcessOrig, INFINITE);
+ printf("[k]Close(%d)\n", hProcessOrig);
+ CloseHandle(hProcessOrig);
+ printf("[k]DeleteFile(%s)\n", path);
+ DeleteFile(path);
+}
+
+int main(int argc, const char *argv[]) {
+
+ // printf("argc=%d\n", argc);
+ // for (size_t i = 0; i < argc; i++) {
+ // printf("argv[%d]=%s\n", i, argv[i]);
+ // }
+
+ if (argc != 4) {
+ return -1;
+ }
+
+ if (strcmp(argv[1], ORIGIN_ME) == 0) {
+ printf("--> unzip\n");
+ unzip(argv[2]);
+ printf("--> runNewBinary\n");
+ runNewBinary(argv[3]);
+ printf("--> cloneSelf\n");
+ cloneSelf();
+ } else if (strcmp(argv[1], KILL_ME) == 0) {
+ printf("-->[k] killSelf\n");
+ delete_original(argv[2], argv[3]);
+ }
+ return 0;
+}