diff --git a/launchers/macosx/Deployer.mm b/launchers/macosx/Deployer.mm index ff9ed9e3eb..79fc863148 100644 --- a/launchers/macosx/Deployer.mm +++ b/launchers/macosx/Deployer.mm @@ -83,7 +83,7 @@ using namespace subprocess; chdir(basePath.c_str()); // Everything behind --exec java - would be passed as arguments to the java executable. - std::string execStr = "/usr/bin/unzip "; //std::string([rs.getJavaHome UTF8String]); + std::string execStr = "/usr/bin/unzip -uo "; //std::string([rs.getJavaHome UTF8String]); execStr += [self.metaInfo.zipFile UTF8String]; //for_each(cli, [&execStr](std::string str){ execStr += std::string(" ") + str; }); diff --git a/launchers/macosx/I2PLauncher.xcodeproj/project.pbxproj b/launchers/macosx/I2PLauncher.xcodeproj/project.pbxproj index 0df0b79658..0818d86c12 100644 --- a/launchers/macosx/I2PLauncher.xcodeproj/project.pbxproj +++ b/launchers/macosx/I2PLauncher.xcodeproj/project.pbxproj @@ -500,7 +500,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nversion=`/usr/libexec/PlistBuddy -c \"Print I2PRoutereVersion\" \"${INFOPLIST_FILE}\"`\ncommit=`mtn heads --branch=i2p.i2p | awk '{ print $1 }' | head -n 1`\nbuildinfo=\"Built $(date), $commit\"\n\n# Use cat to avoid any potential alias of cp asking for overwrite of file.\ncat $SRCROOT/version.h.tpl > $SRCROOT/version.h\nsed -i '' \"s#VERSION_REPLACED_BY_XCODE_BUILD_SCRIPT#$version#g\" $SRCROOT/version.h\nsed -i '' \"s#BUILD_INFO_REPLACED_BY_XCODE_BUILD_SCRIPT#$buildinfo#\" $SRCROOT/version.h\n\n$SRCROOT/check_latest_java.sh\n\n"; + shellScript = "# Type a script or drag a script file from your workspace to insert its path.\nversion=`/usr/libexec/PlistBuddy -c \"Print I2PRouterVersion\" \"${INFOPLIST_FILE}\"`\ncommit=`mtn heads --branch=i2p.i2p | awk '{ print $1 }' | head -n 1`\nbuildinfo=\"Built $(date), $commit\"\n\n# Use cat to avoid any potential alias of cp asking for overwrite of file.\ncat $SRCROOT/version.h.tpl > $SRCROOT/version.h\nsed -i '' \"s#VERSION_REPLACED_BY_XCODE_BUILD_SCRIPT#$version#g\" $SRCROOT/version.h\nsed -i '' \"s#BUILD_INFO_REPLACED_BY_XCODE_BUILD_SCRIPT#$buildinfo#\" $SRCROOT/version.h\n\n$SRCROOT/check_latest_java.sh\n\n"; }; BF1EFA4B215142030014EB07 /* ShellScript */ = { isa = PBXShellScriptBuildPhase; diff --git a/launchers/macosx/I2PLauncher/Info.plist b/launchers/macosx/I2PLauncher/Info.plist index fb2c0f6b2e..1edeb69273 100644 --- a/launchers/macosx/I2PLauncher/Info.plist +++ b/launchers/macosx/I2PLauncher/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 0.1.2 + 0.1.3 CFBundleVersion 5 - I2PRoutereVersion - 0.9.37 + I2PRouterVersion + 0.9.38 LSApplicationCategoryType public.app-category.utilities LSMinimumSystemVersion diff --git a/launchers/macosx/osx_create_dmg.sh b/launchers/macosx/osx_create_dmg.sh index a44946c781..49cf9554ec 100755 --- a/launchers/macosx/osx_create_dmg.sh +++ b/launchers/macosx/osx_create_dmg.sh @@ -4,7 +4,7 @@ DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" source $DIR/.sign-secrets APP_NAME="I2PLauncher" -VERSION="0.9.37" +VERSION="`/usr/libexec/PlistBuddy -c 'Print I2PRouterVersion' Info.plist`" DMG_BACKGROUND_IMG=${BACKGROUND_IMG:-"Background.png"} APP_EXE="${APP_NAME}.app/Contents/MacOS/${APP_NAME}"