morgan/macos-stats
1
0
Fork 0
mirror of https://github.com/morgan9e/macos-stats synced 2026-04-14 00:04:15 +09:00
Code Issues Packages Projects Releases Wiki Activity

- add part of updater.sh for back compatibility

Browse Source 
add dSYMs.zip to .gitignore
This commit is contained in:
Serhiy Mytrovtsiy
2020-07-09 23:58:05 +02:00
parent a0100c994f
commit 50f078c91d
5 changed files with 28 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@@ -8,6 +8,6 @@ xcuserdata
Stats.dmg Stats.dmg
Stats.app Stats.app
create-dmg create-dmg
dSYM.zip dSYMs.zip
Cartfile.resolved Cartfile.resolved

4
Stats.xcodeproj/project.pbxproj
View File

@@ -1695,7 +1695,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 10.14; MACOSX_DEPLOYMENT_TARGET = 10.14;
MARKETING_VERSION = 2.1.10; MARKETING_VERSION = 2.1.9;
PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats; PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1727,7 +1727,7 @@
"@executable_path/../Frameworks", "@executable_path/../Frameworks",
); );
MACOSX_DEPLOYMENT_TARGET = 10.14; MACOSX_DEPLOYMENT_TARGET = 10.14;
MARKETING_VERSION = 2.1.10; MARKETING_VERSION = 2.1.9;
PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats; PRODUCT_BUNDLE_IDENTIFIER = eu.exelban.Stats;
PRODUCT_NAME = "$(TARGET_NAME)"; PRODUCT_NAME = "$(TARGET_NAME)";
PROVISIONING_PROFILE_SPECIFIER = ""; PROVISIONING_PROFILE_SPECIFIER = "";

2
Stats/Supporting Files/Info.plist
View File

@@ -17,7 +17,7 @@
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>$(MARKETING_VERSION)</string> <string>$(MARKETING_VERSION)</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>16</string> <string>31</string>
<key>Description</key> <key>Description</key>
<string>Simple macOS system monitor in your menu bar</string> <string>Simple macOS system monitor in your menu bar</string>
<key>LSApplicationCategoryType</key> <key>LSApplicationCategoryType</key>

26
StatsKit/updater.sh
View File

@@ -4,16 +4,34 @@ DMG_PATH="$HOME/Download/Stats.dmg"
MOUNT_PATH="/tmp/Stats" MOUNT_PATH="/tmp/Stats"
APPLICATION_PATH="/Applications/" APPLICATION_PATH="/Applications/"
STEP=""
while [[ "$#" > 0 ]]; do case $1 in while [[ "$#" > 0 ]]; do case $1 in
-s|--step) STEP="$2"; shift;;
-d|--dmg) DMG_PATH="$2"; shift;; -d|--dmg) DMG_PATH="$2"; shift;;
-a|--app) APPLICATION_PATH="$2"; shift;; -a|--app) APPLICATION_PATH="$2"; shift;;
-m|--mount) MOUNT_PATH="$2"; shift;; -m|--mount) MOUNT_PATH="$2"; shift;;
*) echo "Unknown parameter passed: $1"; exit 1;; *) echo "Unknown parameter passed: $1"; exit 1;;
esac; shift; done esac; shift; done
rm -rf $APPLICATION_PATH/Stats.app if [[ "$STEP" == "2" ]]; then
cp -rf $MOUNT_PATH/Stats.app $APPLICATION_PATH/Stats.app rm -rf $APPLICATION_PATH/Stats.app
cp -rf $MOUNT_PATH/Stats.app $APPLICATION_PATH/Stats.app
$APPLICATION_PATH/Stats.app/Contents/MacOS/Stats --dmg-path "$DMG_PATH" --mount-path "$MOUNT_PATH" $APPLICATION_PATH/Stats.app/Contents/MacOS/Stats --dmg "$DMG_PATH"
echo "New version started" echo "New version started"
elif [[ "$STEP" == "3" ]]; then
/usr/bin/hdiutil detach "$MOUNT_PATH"
/bin/rm -rf "$MOUNT_PATH"
/bin/rm -rf "$DMG_PATH"
echo "Done"
else
rm -rf $APPLICATION_PATH/Stats.app
cp -rf $MOUNT_PATH/Stats.app $APPLICATION_PATH/Stats.app
$APPLICATION_PATH/Stats.app/Contents/MacOS/Stats --dmg-path "$DMG_PATH" --mount-path "$MOUNT_PATH"
echo "New version started"
fi

4
StatsKit/updater.swift
View File

@@ -119,10 +119,10 @@ public class macAppUpdater {
_ = syncShell("/usr/bin/hdiutil attach \(path) -mountpoint /tmp/Stats -noverify -nobrowse -noautoopen") _ = syncShell("/usr/bin/hdiutil attach \(path) -mountpoint /tmp/Stats -noverify -nobrowse -noautoopen")
} }
_ = syncShell("cp $TMPDIR/Stats/app/Stats.app/Contents/Resources/Scripts/updater.sh $TMPDIR/Stats/updater.sh") // copy updater script to tmp folder _ = syncShell("cp /tmp/Stats/Stats.app/Contents/Resources/Scripts/updater.sh $TMPDIR/updater.sh") // copy updater script to tmp folder
let pwd = Bundle.main.bundleURL.absoluteString.replacingOccurrences(of: "file://", with: "").replacingOccurrences(of: "Stats.app/", with: "") let pwd = Bundle.main.bundleURL.absoluteString.replacingOccurrences(of: "file://", with: "").replacingOccurrences(of: "Stats.app/", with: "")
asyncShell("sh $TMPDIR/updater.sh --step 2 --app \(pwd) --dmg \(path) >/dev/null &") // run updater script in in background _ = asyncShell("sh $TMPDIR/updater.sh --app \(pwd) --dmg \(path) >/dev/null &") // run updater script in in background
exit(0) exit(0)
} }
} catch { } catch {