From 0ee3fe915710d186fa03da30c83bc5cc6673e368 Mon Sep 17 00:00:00 2001 From: Alex Date: Wed, 14 Sep 2022 11:07:37 -0500 Subject: [PATCH] Update install.sh to use latest released tag --- install.sh | 17 +++++++++++++---- mobile/ios/Runner.xcodeproj/project.pbxproj | 6 +++--- mobile/ios/Runner/Info.plist | 4 ++-- mobile/ios/fastlane/report.xml | 14 ++++++++------ 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/install.sh b/install.sh index 2444dbb888..1701d33cc2 100755 --- a/install.sh +++ b/install.sh @@ -2,10 +2,19 @@ echo "Starting Immich installation..." ip_address=$(hostname -I | awk '{print $1}') +release_version=$(curl --silent "https://api.github.com/repos/immich-app/immich/releases/latest" | + grep '"tag_name":' | + sed -E 's/.*"([^"]+)".*/\1/') RED='\033[0;31m' GREEN='\032[0;31m' NC='\033[0m' # No Color +get_release_version() { + curl --silent "https://api.github.com/repos/immich-app/immich/releases/latest" | # Get latest release from GitHub api + grep '"tag_name":' | # Get tag line + sed -E 's/.*"([^"]+)".*/\1/' # Pluck JSON value +} + create_immich_directory() { echo "Creating Immich directory..." mkdir -p ./immich-app/immich-data @@ -13,12 +22,12 @@ create_immich_directory() { download_docker_compose_file() { echo "Downloading docker-compose.yml..." - curl -L https://raw.githubusercontent.com/immich-app/immich/main/docker/docker-compose.yml -o ./immich-app/docker-compose.yml >/dev/null 2>&1 + curl -L https://raw.githubusercontent.com/immich-app/immich/$release_version/docker/docker-compose.yml -o ./immich-app/docker-compose.yml >/dev/null 2>&1 } download_dot_env_file() { echo "Downloading .env file..." - curl -L https://raw.githubusercontent.com/immich-app/immich/main/docker/.env.example -o ./immich-app/.env >/dev/null 2>&1 + curl -L https://raw.githubusercontent.com/immich-app/immich/$release_version/docker/.env.example -o ./immich-app/.env >/dev/null 2>&1 } populate_upload_location() { @@ -41,9 +50,9 @@ populate_upload_location() { start_docker_compose() { echo "Starting Immich's docker containers" - if docker compose &> /dev/null; then + if docker compose &>/dev/null; then docker_bin="docker compose" - elif docker-compose &> /dev/null; then + elif docker-compose &>/dev/null; then docker_bin="docker-compose" else echo 'Cannot find `docker compose` or `docker-compose`.' diff --git a/mobile/ios/Runner.xcodeproj/project.pbxproj b/mobile/ios/Runner.xcodeproj/project.pbxproj index b68af41196..a4c34946b9 100644 --- a/mobile/ios/Runner.xcodeproj/project.pbxproj +++ b/mobile/ios/Runner.xcodeproj/project.pbxproj @@ -360,7 +360,7 @@ CODE_SIGN_ENTITLEMENTS = Runner/RunnerProfile.entitlements; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 55; + CURRENT_PROJECT_VERSION = 57; DEVELOPMENT_TEAM = 2F67MQ8R79; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -495,7 +495,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 55; + CURRENT_PROJECT_VERSION = 57; DEVELOPMENT_TEAM = 2F67MQ8R79; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; @@ -522,7 +522,7 @@ CLANG_ENABLE_MODULES = YES; CODE_SIGN_IDENTITY = "Apple Development"; CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 55; + CURRENT_PROJECT_VERSION = 57; DEVELOPMENT_TEAM = 2F67MQ8R79; ENABLE_BITCODE = NO; INFOPLIST_FILE = Runner/Info.plist; diff --git a/mobile/ios/Runner/Info.plist b/mobile/ios/Runner/Info.plist index 4bd4c19474..0864cdaf89 100644 --- a/mobile/ios/Runner/Info.plist +++ b/mobile/ios/Runner/Info.plist @@ -17,11 +17,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.28.0 + 1.29.0 CFBundleSignature ???? CFBundleVersion - 55 + 57 LSRequiresIPhoneOS MGLMapboxMetricsEnabledSettingShownInApp diff --git a/mobile/ios/fastlane/report.xml b/mobile/ios/fastlane/report.xml index 27bbb4e514..2bc4af0aec 100644 --- a/mobile/ios/fastlane/report.xml +++ b/mobile/ios/fastlane/report.xml @@ -5,32 +5,34 @@ - + - + - + - + - + - + + +