From ec9ba7024fd3ee6225e755ebd1cb7c8b25ef574e Mon Sep 17 00:00:00 2001
From: Davide De Rosa <keeshux@gmail.com>
Date: Thu, 12 Dec 2019 20:50:57 +0100
Subject: [PATCH] Move scripts to Core

---
 .env                               |  2 ++
 .gitignore                         |  1 +
 Submodules/Core                    |  2 +-
 scripts/export-for-translations.sh | 32 +-----------------------------
 scripts/list-untranslated.sh       | 29 +--------------------------
 scripts/push-release.sh            |  7 +------
 scripts/reset-archive.sh           |  4 +---
 7 files changed, 8 insertions(+), 69 deletions(-)
 mode change 100755 => 120000 scripts/export-for-translations.sh
 mode change 100755 => 120000 scripts/list-untranslated.sh
 mode change 100755 => 120000 scripts/push-release.sh
 mode change 100755 => 120000 scripts/reset-archive.sh

diff --git a/.env b/.env
index 884bd084..81c9e5f2 100644
--- a/.env
+++ b/.env
@@ -1,5 +1,7 @@
 PLATFORM="ios"
 APP_NAME="Passepartout"
+PROJECT="Passepartout-iOS"
+
 GYM_SCHEME="Passepartout-iOS"
 MATCH_READONLY="true"
 BUILD_PATH="build"
diff --git a/.gitignore b/.gitignore
index 65316a42..91716a5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,4 @@ templates/
 .env.secret*
 Preview.html
 l10n
+passepartout-translations.zip
diff --git a/Submodules/Core b/Submodules/Core
index a2576134..65e00bc1 160000
--- a/Submodules/Core
+++ b/Submodules/Core
@@ -1 +1 @@
-Subproject commit a25761342a62c75723d523a5c4a0440ad342191c
+Subproject commit 65e00bc19c74dd8a9f61285d3c442cf97781e88d
diff --git a/scripts/export-for-translations.sh b/scripts/export-for-translations.sh
deleted file mode 100755
index 520487ab..00000000
--- a/scripts/export-for-translations.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-DIST="l10n"
-DIST_APP="$DIST/App"
-DIST_META="$DIST/Meta"
-OUTPUT="passepartout-translations.zip"
-
-rm -rf $OUTPUT $DIST
-mkdir -p $DIST_APP
-mkdir -p $DIST_META
-
-if [[ $1 == "all" ]]; then
-    cp Submodules/Core/Passepartout/Resources/en.lproj/Core.strings $DIST_APP/Core.txt
-    cp Submodules/Core/Passepartout/Resources/en.lproj/Intents.strings $DIST_APP/Intents.txt
-    cp Passepartout-iOS/Global/en.lproj/App.strings $DIST_APP/App.txt
-    cp Passepartout-iOS/en.lproj/InfoPlist.strings $DIST_APP/InfoPlist.txt
-
-    cp fastlane/metadata/en-US/name.txt $DIST_META
-    cp fastlane/metadata/en-US/subtitle.txt $DIST_META
-    cp fastlane/metadata/en-US/description.txt $DIST_META
-elif [[ $1 == "new" ]]; then
-    grep -f templates/new-strings.txt Submodules/Core/Passepartout/Resources/en.lproj/Core.strings >$DIST_APP/Core.txt
-    grep -f templates/new-strings.txt Submodules/Core/Passepartout/Resources/en.lproj/Intents.strings >$DIST_APP/Intents.txt
-    grep -f templates/new-strings.txt Passepartout-iOS/Global/en.lproj/App.strings >$DIST_APP/App.txt
-    grep -f templates/new-strings.txt Passepartout-iOS/en.lproj/InfoPlist.strings >$DIST_APP/InfoPlist.txt
-else
-    echo "No argument given (all|new)"
-    exit
-fi
-
-cp templates/iaps.txt $DIST/Products.txt
-zip -r $OUTPUT $DIST
diff --git a/scripts/export-for-translations.sh b/scripts/export-for-translations.sh
new file mode 120000
index 00000000..306f13a0
--- /dev/null
+++ b/scripts/export-for-translations.sh
@@ -0,0 +1 @@
+../Submodules/Core/scripts/export-for-translations.sh
\ No newline at end of file
diff --git a/scripts/list-untranslated.sh b/scripts/list-untranslated.sh
deleted file mode 100755
index 5d8acd83..00000000
--- a/scripts/list-untranslated.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-DIR_APP="Passepartout-iOS/Global"
-FILENAME_APP="App.strings"
-DIR_CORE="Submodules/Core/Passepartout/Resources"
-FILENAME_CORE="Core.strings"
-
-if [[ $2 = "core" ]]; then
-    DIR=$DIR_CORE
-    FILENAME=$FILENAME_CORE
-else
-    DIR=$DIR_APP
-    FILENAME=$FILENAME_APP
-fi
-
-LANG_BASE="en"
-LANG_TARGET="$1"
-STRINGS_BASE="$DIR/$LANG_BASE.lproj/$FILENAME"
-STRINGS_TARGET="$DIR/$LANG_TARGET.lproj/$FILENAME"
-IDS="string-ids.tmp"
-TMPOUT="untranslated.tmp"
-
-sed -E "s/^(.+) = .*$/\1/" $STRINGS_BASE | sort | grep '^"' >$IDS.$LANG_BASE
-sed -E "s/^(.+) = .*$/\1/" $STRINGS_TARGET | sort | grep '^"' >$IDS.$LANG_TARGET
-diff $IDS.$LANG_BASE $IDS.$LANG_TARGET | grep "^<" | sed -E 's/^< "(.*)"$/\1/g' >$TMPOUT
-rm -f $IDS.*
-
-grep -f $TMPOUT $STRINGS_BASE
-rm $TMPOUT
diff --git a/scripts/list-untranslated.sh b/scripts/list-untranslated.sh
new file mode 120000
index 00000000..348d61b0
--- /dev/null
+++ b/scripts/list-untranslated.sh
@@ -0,0 +1 @@
+../Submodules/Core/scripts/list-untranslated.sh
\ No newline at end of file
diff --git a/scripts/push-release.sh b/scripts/push-release.sh
deleted file mode 100755
index 7585f1f2..00000000
--- a/scripts/push-release.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-git push && git push github
-git push --tags && git push --tags github
-git checkout stable && git merge master
-git push github
-git checkout master
diff --git a/scripts/push-release.sh b/scripts/push-release.sh
new file mode 120000
index 00000000..68eb3a93
--- /dev/null
+++ b/scripts/push-release.sh
@@ -0,0 +1 @@
+../Submodules/Core/scripts/push-release.sh
\ No newline at end of file
diff --git a/scripts/reset-archive.sh b/scripts/reset-archive.sh
deleted file mode 100755
index 0d0f4dcb..00000000
--- a/scripts/reset-archive.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-git checkout Passepartout*/Info.plist
-git checkout Passepartout*.pbxproj
diff --git a/scripts/reset-archive.sh b/scripts/reset-archive.sh
new file mode 120000
index 00000000..c874f401
--- /dev/null
+++ b/scripts/reset-archive.sh
@@ -0,0 +1 @@
+../Submodules/Core/scripts/reset-archive.sh
\ No newline at end of file