Oh this fun thing.

Casterlabs · Dec 22, 2024 · 791a37f · 791a37f
1 parent e029655
commit 791a37f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/Installer.nsi b/Installer.nsi
@@ -75,13 +75,13 @@ SectionEnd
 
 Section "Desktop Shortcut" DeskShort
   IfSilent +2 ; Don't create Desktop shortcut when silent.
-  CreateShortCut "$DESKTOP\${NAME}.lnk" "$INSTDIR\Casterlabs-Caffeinated.exe"
+  CreateShortCut "$DESKTOP\${NAME}.lnk" "$INSTDIR\Casterlabs-Caffeinated-Updater.exe"
 SectionEnd
 
 Section "Start Menu Shortcut" StartShort
   IfSilent +4 ; Don't create StartMenu shortcut when silent.
   CreateDirectory "$SMPROGRAMS\${COMPANY}"
-  CreateShortCut "$SMPROGRAMS\${COMPANY}\${NAME}.lnk" "$INSTDIR\Casterlabs-Caffeinated.exe"
+  CreateShortCut "$SMPROGRAMS\${COMPANY}\${NAME}.lnk" "$INSTDIR\Casterlabs-Caffeinated-Updater.exe"
   CreateShortCut "$SMPROGRAMS\${COMPANY}\Uninstall ${NAME}.lnk" "$INSTDIR\uninstall.exe"
 SectionEnd
 

diff --git a/build.sh b/build.sh
@@ -3,7 +3,7 @@
 set -e -o pipefail
 
 APP_ID="co.casterlabs.caffeinated"
-APP_NAME="Casterlabs-Caffeinated"
+APP_NAME="Casterlabs-Caffeinated-Updater"
 MAIN_CLASS="co.casterlabs.caffeinated.updater.Launcher"
 
 if [[ $@ == *"compile"* ]]; then
@@ -18,7 +18,7 @@ if [[ $@ == *"dist-windows"* ]]; then
     java -jar bundler.jar bundle \
         --arch x86_64 --os windows \
         --id $APP_ID --name $APP_NAME --icon icon.png \
-        --sign 'cmd.exe /C C:\signing\sign.bat Casterlabs-Caffeinated.exe' \
+        --sign 'cmd.exe /C C:\signing\sign.bat $APP_NAME.exe' \
         --java 11 --arg=-Dcaffeinated.channel=stable --dependency target/Casterlabs-Caffeinated-Updater.jar --main $MAIN_CLASS
 
     echo "------------ Finished bundling for Windows ------------"

diff --git a/src/main/java/co/casterlabs/caffeinated/updater/Launcher.java b/src/main/java/co/casterlabs/caffeinated/updater/Launcher.java
@@ -83,11 +83,11 @@ public static void main(String[] args) throws Exception {
         dieFile.delete();
         Thread.sleep(500);
 
-//        try {
-//            Updater.target.forceKillApp();
-//        } catch (Throwable t) {
-//            FastLogger.logStatic(LogLevel.WARNING, "Could not force kill the app, this is probably fine.\n%s", t);
-//        }
+        try {
+            Updater.target.forceKillApp();
+        } catch (Throwable t) {
+            FastLogger.logStatic(LogLevel.WARNING, "Could not force kill the app, this is probably fine.\n%s", t);
+        }
 
         doChecks();
     }