diff --git a/app/shell/installer.nsi b/app/shell/installer.nsi index 841d6d0..4ef43bd 100644 --- a/app/shell/installer.nsi +++ b/app/shell/installer.nsi @@ -233,8 +233,7 @@ Section "Jarvis (필수)" SecMain WriteRegStr HKLM "${UNINST_KEY}" "QuietUninstallString" '"$INSTDIR\uninstall.exe" /S' WriteRegDWORD HKLM "${UNINST_KEY}" "NoModify" 1 WriteRegDWORD HKLM "${UNINST_KEY}" "NoRepair" 1 - ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2 - WriteRegDWORD HKLM "${UNINST_KEY}" "EstimatedSize" $0 + WriteRegDWORD HKLM "${UNINST_KEY}" "EstimatedSize" ${SIZE_KB} SectionEnd Section "시작 메뉴 바로 가기" SecStart diff --git a/app/shell/installer.sh b/app/shell/installer.sh index fd07c35..88a108b 100755 --- a/app/shell/installer.sh +++ b/app/shell/installer.sh @@ -17,7 +17,10 @@ list="$target/uninstall-list.nsh" (cd "$out/Jarvis" && find python-src display-driver -type f | sort | sed 's|/|\\|g; s|^| Delete "$INSTDIR\\|; s|$|"|' cd "$out/Jarvis" && find python-src display-driver -type d | sort -r | sed 's|/|\\|g; s|^| RMDir "$INSTDIR\\|; s|$|"|') > "$list" setup="$out/Jarvis-Setup-$version.exe" +# The uninstall entry's size: what this setup installs, counted here. Counting the install folder on +# the user's PC would also walk a data folder kept inside it (models, runtime: many thousand files). +size_kb=$(cd "$out/Jarvis" && du -sk --apparent-size -c jarvis.exe WebView2Loader.dll python-src display-driver | tail -1 | cut -f1) makensis -V2 -DVERSION="$version" -DSRC="$out/Jarvis" -DOUT="$setup" -DICON="$here/icons/icon.ico" \ - -DWEBVIEW2="$wv2" -DUNINSTALL_LIST="$list" ${NSIS_EXTRA:-} "$here/installer.nsi" + -DWEBVIEW2="$wv2" -DUNINSTALL_LIST="$list" -DSIZE_KB="$size_kb" ${NSIS_EXTRA:-} "$here/installer.nsi" (cd "$out" && sha256sum "Jarvis-Setup-$version.exe" > "Jarvis-Setup-$version.exe.sha256") echo "$setup"