fix build arch - bump 2.0.1

victorwads · Apr 19, 2023 · 1f59ad0 · 1f59ad0
1 parent ade0421
commit 1f59ad0
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -9,7 +9,10 @@
   - open original text log files
   - archive logs for better analyses and performance
 
-* [2.0 - Current](https://github.com/victorwads/UptimeLogger/releases/download/1.4/UptimeLogger-2.0.dmg)
+- [2.0.1 - Current](https://github.com/victorwads/UptimeLogger/releases/download/2.0.1/UptimeLogger-2.0.1.dmg)
+  - Fix for x86_64 macs
+
+* [2.0 - Current](https://github.com/victorwads/UptimeLogger/releases/download/2.0/UptimeLogger-2.0.dmg)
   * App
     * Fixes
       * Fixed file access issue

diff --git a/Pkg/Install/postinstall b/Pkg/Install/postinstall
@@ -23,14 +23,10 @@ SERVICE_PLIST=$(cat <<EOF
 EOF
 )
 
-if [ -f "/Library/LaunchDaemons/$SERVICE_NAME.plist" ]; then
-    sudo launchctl unload "/Library/LaunchDaemons/$SERVICE_NAME.plist"
-    sudo rm "/Library/LaunchDaemons/$SERVICE_NAME.plist"
-fi
-
 LOGS_DIR="/Library/Application Support/UptimeLogger"
 LAST_LOG_LINK="$LOGS_DIR/latest"
 if [ -f "$LAST_LOG_LINK" ]; then
+    echo "Setuping service for update"
     UPDATE_FILE="$LOGS_DIR/updated"
 
     LASTLOGFILE="$(readlink "$LAST_LOG_LINK")"
@@ -40,6 +36,12 @@ if [ -f "$LAST_LOG_LINK" ]; then
     echo "$LATEST_STARTUP" > "$UPDATE_FILE"
 fi
 
+if [ -f "/Library/LaunchDaemons/$SERVICE_NAME.plist" ]; then
+    echo "Removing old service using sudo"
+    sudo launchctl unload "/Library/LaunchDaemons/$SERVICE_NAME.plist"
+    sudo rm "/Library/LaunchDaemons/$SERVICE_NAME.plist"
+fi
+
 echo "Installer service at $SERVICE_FILE using sudo"
 echo "$SERVICE_PLIST" | sudo tee "$SERVICE_FILE" >/dev/null
 

diff --git a/Pkg/createPackage.sh b/Pkg/createPackage.sh
@@ -2,7 +2,7 @@
 BUNDLE_NAME="br.com.victorwads.UptimeLogger"
 INSTALLER_NAME="Install UptimeLogger"
 UNINSTALLER_NAME="Uninstall"
-VERSION="2.0"
+VERSION="2.0.1"
 
 CACHE_FOLDER="cache"
 APP_FOLDER="$CACHE_FOLDER/Build/Products/Release/UptimeLogger.app"
@@ -13,7 +13,10 @@ rm -f ../Service/logs/*
 
 # Apaga caches anteriores
 echo "\033[32mBuildando app release\033[0m"
-xcodebuild -project ../UptimeLogger.xcodeproj -scheme UptimeLogger -configuration Release -derivedDataPath "$CACHE_FOLDER" > /dev/null
+xcodebuild  -project ../UptimeLogger.xcodeproj\
+            -scheme UptimeLogger -configuration Release\
+            -destination 'generic/platform=macOS'\
+            -derivedDataPath "$CACHE_FOLDER" > /dev/null
 
 mkdir "$DMG_FOLDER"
 
@@ -33,6 +36,8 @@ hdiutil create -volname "UptimeLogger"\
     -ov -format UDZO\
     "UptimeLogger-$VERSION.dmg"
 
+# cp "$DMG_FOLDER/$INSTALLER_NAME.pkg" "./$INSTALLER_NAME.pkg"
+# cp -R "$CACHE_FOLDER/Build/Products/Release/UptimeLogger.app" ./
+
 echo "\033[32mApagando caches\033[0m"
-cp "$DMG_FOLDER/$INSTALLER_NAME.pkg" "./$INSTALLER_NAME.pkg"
 rm -rf "$CACHE_FOLDER"
diff --git a/Pkg/exportTests.sh b/Pkg/exportTests.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+BUNDLE_NAME="br.com.victorwads.UptimeLogger"
+INSTALLER_NAME="Install UptimeLogger"
+UNINSTALLER_NAME="Uninstall"
+VERSION="2.0"
+
+CACHE_FOLDER="cache"
+APP_FOLDER="$CACHE_FOLDER/Build/Products/Release/UptimeLogger.app"
+DMG_FOLDER="$CACHE_FOLDER/dmg"
+
+# Apagando testes anteriores
+rm -R Tests.xcresult
+
+# Apaga caches anteriores
+echo "\033[32mBuildando app release\033[0m"
+xcodebuild test -project ../UptimeLogger.xcodeproj\
+                -scheme UptimeLogger\
+                -destination 'platform=macOS'\
+                -derivedDataPath "$CACHE_FOLDER"
+
+xcov    -p ../UptimeLogger.xcodeproj\
+        -s UptimeLogger --html_report\
+        --derived_data_path "$CACHE_FOLDER"
+
+echo "\033[32mApagando caches\033[0m"
+rm -rf "$CACHE_FOLDER"
diff --git a/UptimeLogger.xcodeproj/project.pbxproj b/UptimeLogger.xcodeproj/project.pbxproj
@@ -540,7 +540,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = "\"UptimeLogger/Preview Content\"";
 				DEVELOPMENT_TEAM = DU6489YN3U;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -555,7 +555,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 2.0;
+				MARKETING_VERSION = 2.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = br.com.victorwads.UptimeLogger;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -574,7 +574,7 @@
 				"CODE_SIGN_IDENTITY[sdk=macosx*]" = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 4;
+				CURRENT_PROJECT_VERSION = 5;
 				DEVELOPMENT_ASSET_PATHS = "\"UptimeLogger/Preview Content\"";
 				DEVELOPMENT_TEAM = DU6489YN3U;
 				ENABLE_HARDENED_RUNTIME = YES;
@@ -589,7 +589,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 11.0;
-				MARKETING_VERSION = 2.0;
+				MARKETING_VERSION = 2.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = br.com.victorwads.UptimeLogger;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";