From eef49dbc9f6e36aade384872f3324fb5ec8181e1 Mon Sep 17 00:00:00 2001 From: SpiritCroc Date: Sat, 21 Aug 2021 10:02:33 +0200 Subject: [PATCH] alternative_package.sh: Add {foss,fcm} variants Change-Id: If4d3ced0ab55292278bee4f72fd7b12468206a9a --- alternative_package.sh | 14 ++++++++++---- fastlane_alternatives/fcm_full_description.txt | 1 + fastlane_alternatives/fcm_short_description.txt | 1 + fastlane_alternatives/foss_full_description.txt | 1 + fastlane_alternatives/foss_short_description.txt | 1 + .../testing_fcm_full_description.txt | 0 .../testing_fcm_short_description.txt | 0 .../testing_foss_full_description.txt | 1 + .../testing_foss_short_description.txt | 1 + fastlane_testing/foss_full_description.txt | 1 - fastlane_testing/foss_short_description.txt | 1 - 11 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 fastlane_alternatives/fcm_full_description.txt create mode 100644 fastlane_alternatives/fcm_short_description.txt create mode 100644 fastlane_alternatives/foss_full_description.txt create mode 100644 fastlane_alternatives/foss_short_description.txt rename fastlane_testing/fcm_full_description.txt => fastlane_alternatives/testing_fcm_full_description.txt (100%) rename fastlane_testing/fcm_short_description.txt => fastlane_alternatives/testing_fcm_short_description.txt (100%) create mode 100644 fastlane_alternatives/testing_foss_full_description.txt create mode 100644 fastlane_alternatives/testing_foss_short_description.txt delete mode 100644 fastlane_testing/foss_full_description.txt delete mode 100644 fastlane_testing/foss_short_description.txt diff --git a/alternative_package.sh b/alternative_package.sh index 2f5ff97571..91460b2e0a 100755 --- a/alternative_package.sh +++ b/alternative_package.sh @@ -103,13 +103,19 @@ sed -i "s|SchildiChat|$name_replace|g" `find "$fastlane_dir/metadata/android" -n if [ "$package_add" = "testing.foss" ]; then - find "$fastlane_dir" -name full_description.txt -exec cp "$fastlane_dir/../fastlane_testing/foss_full_description.txt" '{}' \; - find "$fastlane_dir" -name short_description.txt -exec cp "$fastlane_dir/../fastlane_testing/foss_short_description.txt" '{}' \; + find "$fastlane_dir" -name full_description.txt -exec cp "$fastlane_dir/../fastlane_alternatives/testing_foss_full_description.txt" '{}' \; + find "$fastlane_dir" -name short_description.txt -exec cp "$fastlane_dir/../fastlane_alternatives/testing_foss_short_description.txt" '{}' \; logo_beta elif [ "$package_add" = "testing.fcm" ]; then - find "$fastlane_dir" -name full_description.txt -exec cp "$fastlane_dir/../fastlane_testing/fcm_full_description.txt" '{}' \; - find "$fastlane_dir" -name short_description.txt -exec cp "$fastlane_dir/../fastlane_testing/fcm_short_description.txt" '{}' \; + find "$fastlane_dir" -name full_description.txt -exec cp "$fastlane_dir/../fastlane_alternatives/testing_fcm_full_description.txt" '{}' \; + find "$fastlane_dir" -name short_description.txt -exec cp "$fastlane_dir/../fastlane_alternatives/testing_fcm_short_description.txt" '{}' \; logo_beta +elif [ "$package_add" = "foss" ]; then + find "$fastlane_dir" -name full_description.txt -exec cp "$fastlane_dir/../fastlane_alternatives/foss_full_description.txt" '{}' \; + find "$fastlane_dir" -name short_description.txt -exec cp "$fastlane_dir/../fastlane_alternatives/foss_short_description.txt" '{}' \; +elif [ "$package_add" = "fcm" ]; then + find "$fastlane_dir" -name full_description.txt -exec cp "$fastlane_dir/../fastlane_alternatives/fcm_full_description.txt" '{}' \; + find "$fastlane_dir" -name short_description.txt -exec cp "$fastlane_dir/../fastlane_alternatives/fcm_short_description.txt" '{}' \; fi git add -A diff --git a/fastlane_alternatives/fcm_full_description.txt b/fastlane_alternatives/fcm_full_description.txt new file mode 100644 index 0000000000..c9f54db3ea --- /dev/null +++ b/fastlane_alternatives/fcm_full_description.txt @@ -0,0 +1 @@ +Variant of SchildiChat with proprietary (Google) push notifications diff --git a/fastlane_alternatives/fcm_short_description.txt b/fastlane_alternatives/fcm_short_description.txt new file mode 100644 index 0000000000..c9f54db3ea --- /dev/null +++ b/fastlane_alternatives/fcm_short_description.txt @@ -0,0 +1 @@ +Variant of SchildiChat with proprietary (Google) push notifications diff --git a/fastlane_alternatives/foss_full_description.txt b/fastlane_alternatives/foss_full_description.txt new file mode 100644 index 0000000000..815b9d08e7 --- /dev/null +++ b/fastlane_alternatives/foss_full_description.txt @@ -0,0 +1 @@ +FOSS variant of SchildiChat without proprietary push notifications diff --git a/fastlane_alternatives/foss_short_description.txt b/fastlane_alternatives/foss_short_description.txt new file mode 100644 index 0000000000..815b9d08e7 --- /dev/null +++ b/fastlane_alternatives/foss_short_description.txt @@ -0,0 +1 @@ +FOSS variant of SchildiChat without proprietary push notifications diff --git a/fastlane_testing/fcm_full_description.txt b/fastlane_alternatives/testing_fcm_full_description.txt similarity index 100% rename from fastlane_testing/fcm_full_description.txt rename to fastlane_alternatives/testing_fcm_full_description.txt diff --git a/fastlane_testing/fcm_short_description.txt b/fastlane_alternatives/testing_fcm_short_description.txt similarity index 100% rename from fastlane_testing/fcm_short_description.txt rename to fastlane_alternatives/testing_fcm_short_description.txt diff --git a/fastlane_alternatives/testing_foss_full_description.txt b/fastlane_alternatives/testing_foss_full_description.txt new file mode 100644 index 0000000000..5bf298770d --- /dev/null +++ b/fastlane_alternatives/testing_foss_full_description.txt @@ -0,0 +1 @@ +SchildiChat test release, FOSS variant without proprietary push notifications diff --git a/fastlane_alternatives/testing_foss_short_description.txt b/fastlane_alternatives/testing_foss_short_description.txt new file mode 100644 index 0000000000..5bf298770d --- /dev/null +++ b/fastlane_alternatives/testing_foss_short_description.txt @@ -0,0 +1 @@ +SchildiChat test release, FOSS variant without proprietary push notifications diff --git a/fastlane_testing/foss_full_description.txt b/fastlane_testing/foss_full_description.txt deleted file mode 100644 index 76ba868aa7..0000000000 --- a/fastlane_testing/foss_full_description.txt +++ /dev/null @@ -1 +0,0 @@ -SchildiChat test release, F-Droid variant without proprietary push notifications diff --git a/fastlane_testing/foss_short_description.txt b/fastlane_testing/foss_short_description.txt deleted file mode 100644 index 76ba868aa7..0000000000 --- a/fastlane_testing/foss_short_description.txt +++ /dev/null @@ -1 +0,0 @@ -SchildiChat test release, F-Droid variant without proprietary push notifications