From ec166ce473b1cd26dd29688f893f91c6cc08267f Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 11:02:33 -0800 Subject: [PATCH 01/17] testing newline changes --- .github/workflows/instances.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index 67377cb8f..8f86075c8 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -71,8 +71,8 @@ jobs: safariContentInstances=" \"$instance"\" lastLine=false else - safariManifestInstances="$safariManifestInstances,\n \"*://$instance/*\"" - safariContentInstances="$safariContentInstances,\n \"$instance\"" + safariManifestInstances="$safariManifestInstances,$'\n' \"*://$instance/*\"" + safariContentInstances="$safariContentInstances,$'\n' \"$instance\"" fi done < lemmy-instances.txt From 8d0829c3bf3314d8ebaba5f42d48f1b93e43222e Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 11:16:41 -0800 Subject: [PATCH 02/17] removed pr creation temporarily, adjusted newline logic --- .github/workflows/instances.yml | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index 8f86075c8..95b2b8a88 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -75,6 +75,12 @@ jobs: safariContentInstances="$safariContentInstances,$'\n' \"$instance\"" fi done < lemmy-instances.txt + + safariManifestInstances={echo -e "$safariManifestInstances"} + safariContentInstances={echo -e "$safariContentInstances"} + + echo $safariManifestInstances + echo $safariContentInstances # Generates the new manifest.json with the updated instances inSection=false @@ -119,13 +125,3 @@ jobs: echo "$line" >> "ios/Open In Thunder/Resources/content-new.js" done < "ios/Open In Thunder/Resources/content.js" mv "ios/Open In Thunder/Resources/content-new.js" "ios/Open In Thunder/Resources/content.js" - - - name: Create Pull Request - uses: peter-evans/create-pull-request@v5.0.2 - with: - commit-message: Update instances - title: Update instances - body: This PR is updating `lemmy-instances.txt`, `instances.dart`, `AndroidManifest.xml`, `manifest.json` and `content.js` with the latest list of instances retrieved from fediverse.observer. - branch: update-instances - delete-branch: true - author: GitHub From 9785b20757812715508179f264df2d8d27b2c3e6 Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 11:18:42 -0800 Subject: [PATCH 03/17] more newline adjustments --- .github/workflows/instances.yml | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index 95b2b8a88..69fc9c511 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -71,14 +71,11 @@ jobs: safariContentInstances=" \"$instance"\" lastLine=false else - safariManifestInstances="$safariManifestInstances,$'\n' \"*://$instance/*\"" - safariContentInstances="$safariContentInstances,$'\n' \"$instance\"" + safariManifestInstances="$safariManifestInstances,$'\\n' \"*://$instance/*\"" + safariContentInstances="$safariContentInstances,$'\\n' \"$instance\"" fi done < lemmy-instances.txt - safariManifestInstances={echo -e "$safariManifestInstances"} - safariContentInstances={echo -e "$safariContentInstances"} - echo $safariManifestInstances echo $safariContentInstances From 5005fdd3321f01874b2a52d84bc913e6175a39e8 Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 11:19:43 -0800 Subject: [PATCH 04/17] more newline adjustments --- .github/workflows/instances.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index 69fc9c511..7f88de18e 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -71,8 +71,8 @@ jobs: safariContentInstances=" \"$instance"\" lastLine=false else - safariManifestInstances="$safariManifestInstances,$'\\n' \"*://$instance/*\"" - safariContentInstances="$safariContentInstances,$'\\n' \"$instance\"" + safariManifestInstances="$safariManifestInstances,\\n \"*://$instance/*\"" + safariContentInstances="$safariContentInstances,\\n \"$instance\"" fi done < lemmy-instances.txt From 9732b5301dda0d75e2ce2cc54fa031e2f42c3b39 Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 11:20:46 -0800 Subject: [PATCH 05/17] more newline adjustments --- .github/workflows/instances.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index 7f88de18e..edf119106 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -71,8 +71,8 @@ jobs: safariContentInstances=" \"$instance"\" lastLine=false else - safariManifestInstances="$safariManifestInstances,\\n \"*://$instance/*\"" - safariContentInstances="$safariContentInstances,\\n \"$instance\"" + safariManifestInstances="$safariManifestInstances,\n \"*://$instance/*\"" + safariContentInstances="$safariContentInstances,\n \"$instance\"" fi done < lemmy-instances.txt From 3a0cff7fe7636ce380f6985ed9ac63fa253f85ef Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 11:38:15 -0800 Subject: [PATCH 06/17] more newline adjustments --- .github/workflows/instances.yml | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index edf119106..756a32c14 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -76,9 +76,17 @@ jobs: fi done < lemmy-instances.txt - echo $safariManifestInstances - echo $safariContentInstances + echo "safariManifestInstances<> $GITHUB_ENV + echo "$safariManifestInstances" >> $GITHUB_ENV + echo "EOF" >> $GITHUB_ENV + echo "safariContentInstances<> $GITHUB_ENV + echo "$safariContentInstances" >> $GITHUB_ENV + echo "EOF" >> $GITHUB_ENV + + echo "The string is: ${{ env.safariManifestInstances }}" + echo "The string is: ${{ env.safariContentInstances }}" + # Generates the new manifest.json with the updated instances inSection=false while IFS= read -r line; do @@ -87,7 +95,7 @@ jobs: fi if [[ $line == " ]" ]]; then - echo "$safariManifestInstances" >> "ios/Open In Thunder/Resources/manifest-new.json" + echo ${{ env.safariManifestInstances }} >> "ios/Open In Thunder/Resources/manifest-new.json" inSection=false fi @@ -109,7 +117,7 @@ jobs: fi if [[ $line == "];" ]]; then - echo "$safariContentInstances" >> "ios/Open In Thunder/Resources/content-new.js" + echo ${{ env.safariContentInstances }} >> "ios/Open In Thunder/Resources/content-new.js" inSection=false fi From d70cfcd2a867fb73a535754a346dc1d443087b84 Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 11:45:41 -0800 Subject: [PATCH 07/17] more newline adjustments --- .github/workflows/instances.yml | 47 ++++++++++++++------------------- 1 file changed, 20 insertions(+), 27 deletions(-) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index 756a32c14..467066737 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -59,33 +59,26 @@ jobs: # ---------- Safari Extension ---------- - safariManifestInstances="" - safariContentInstances="" - lastLine=true + safariManifestInstances=$(awk 'BEGIN {lastLine=1} { + if (lastLine) { + print " \"*://"$0"/*\"" + lastLine=0 + } else { + print ",\n \"*://"$0"/*\"" + } + }' lemmy-instances.txt) - # Generate the Safari extension domains used in manifest.json and content.js - # It ignores the last comma in the list to generate proper json - while IFS= read -r instance; do - if [ "$lastLine" = true ]; then - safariManifestInstances=" \"*://$instance/*\"" - safariContentInstances=" \"$instance"\" - lastLine=false - else - safariManifestInstances="$safariManifestInstances,\n \"*://$instance/*\"" - safariContentInstances="$safariContentInstances,\n \"$instance\"" - fi - done < lemmy-instances.txt - - echo "safariManifestInstances<> $GITHUB_ENV - echo "$safariManifestInstances" >> $GITHUB_ENV - echo "EOF" >> $GITHUB_ENV - - echo "safariContentInstances<> $GITHUB_ENV - echo "$safariContentInstances" >> $GITHUB_ENV - echo "EOF" >> $GITHUB_ENV + safariContentInstances=$(awk 'BEGIN {lastLine=1} { + if (lastLine) { + print " \""$0"\"" + lastLine=0 + } else { + print ",\n \""$0"\"" + } + }' lemmy-instances.txt) - echo "The string is: ${{ env.safariManifestInstances }}" - echo "The string is: ${{ env.safariContentInstances }}" + echo "safariManifestInstances: $safariManifestInstances" + echo "safariContentInstances: $safariContentInstances" # Generates the new manifest.json with the updated instances inSection=false @@ -95,7 +88,7 @@ jobs: fi if [[ $line == " ]" ]]; then - echo ${{ env.safariManifestInstances }} >> "ios/Open In Thunder/Resources/manifest-new.json" + echo $safariManifestInstances >> "ios/Open In Thunder/Resources/manifest-new.json" inSection=false fi @@ -117,7 +110,7 @@ jobs: fi if [[ $line == "];" ]]; then - echo ${{ env.safariContentInstances }} >> "ios/Open In Thunder/Resources/content-new.js" + echo $safariContentInstances >> "ios/Open In Thunder/Resources/content-new.js" inSection=false fi From 4159331bc62f7c9103bdd177c84999635d6e52b6 Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 11:51:59 -0800 Subject: [PATCH 08/17] more newline adjustments --- .github/workflows/instances.yml | 50 ++++++++++++++++++--------------- 1 file changed, 28 insertions(+), 22 deletions(-) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index 467066737..dee80467f 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -59,27 +59,23 @@ jobs: # ---------- Safari Extension ---------- - safariManifestInstances=$(awk 'BEGIN {lastLine=1} { - if (lastLine) { - print " \"*://"$0"/*\"" - lastLine=0 - } else { - print ",\n \"*://"$0"/*\"" - } - }' lemmy-instances.txt) + safariManifestInstances="" + safariContentInstances="" + lastLine=true + + # Generate the Safari extension domains used in manifest.json and content.js + # It ignores the last comma in the list to generate proper json + while IFS= read -r instance; do + if [ "$lastLine" = true ]; then + safariManifestInstances=" \"*://$instance/*"\\n" + safariContentInstances=" \"$instance\"\n" + lastLine=false + else + safariManifestInstances="$safariManifestInstances,\n \"*://$instance/*\"" + safariContentInstances="$safariContentInstances,\n \"$instance\"" + fi + done < lemmy-instances.txt - safariContentInstances=$(awk 'BEGIN {lastLine=1} { - if (lastLine) { - print " \""$0"\"" - lastLine=0 - } else { - print ",\n \""$0"\"" - } - }' lemmy-instances.txt) - - echo "safariManifestInstances: $safariManifestInstances" - echo "safariContentInstances: $safariContentInstances" - # Generates the new manifest.json with the updated instances inSection=false while IFS= read -r line; do @@ -88,7 +84,7 @@ jobs: fi if [[ $line == " ]" ]]; then - echo $safariManifestInstances >> "ios/Open In Thunder/Resources/manifest-new.json" + printf "$safariManifestInstances" >> "ios/Open In Thunder/Resources/manifest-new.json" inSection=false fi @@ -110,7 +106,7 @@ jobs: fi if [[ $line == "];" ]]; then - echo $safariContentInstances >> "ios/Open In Thunder/Resources/content-new.js" + printf "$safariContentInstances" >> "ios/Open In Thunder/Resources/content-new.js" inSection=false fi @@ -123,3 +119,13 @@ jobs: echo "$line" >> "ios/Open In Thunder/Resources/content-new.js" done < "ios/Open In Thunder/Resources/content.js" mv "ios/Open In Thunder/Resources/content-new.js" "ios/Open In Thunder/Resources/content.js" + + - name: Create Pull Request + uses: peter-evans/create-pull-request@v5.0.2 + with: + commit-message: Update instances + title: Experimental - Update instances + body: This PR is updating `lemmy-instances.txt`, `instances.dart`, `AndroidManifest.xml`, `manifest.json` and `content.js` with the latest list of instances retrieved from fediverse.observer. + branch: test-update-instances + delete-branch: true + author: GitHub From 0a41188c3ab93365275b1b4db9a01177c8ec7f0a Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 12:11:17 -0800 Subject: [PATCH 09/17] using printf instead, added more logic to format output file properly --- .github/workflows/instances.yml | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index dee80467f..34a950881 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -58,18 +58,27 @@ jobs: mv android/app/src/main/AndroidManifest-new.xml android/app/src/main/AndroidManifest.xml # ---------- Safari Extension ---------- - + totalLines=$(wc -l < lemmy-instances.txt) + currentLine=0 + + echo $totalLines + safariManifestInstances="" safariContentInstances="" - lastLine=true # Generate the Safari extension domains used in manifest.json and content.js # It ignores the last comma in the list to generate proper json while IFS= read -r instance; do - if [ "$lastLine" = true ]; then - safariManifestInstances=" \"*://$instance/*"\\n" - safariContentInstances=" \"$instance\"\n" - lastLine=false + ((currentLine++)) + + if [ "$currentLine" -eq 1 ]; then + # First line + safariManifestInstances=" \"*://$instance/*\"" + safariContentInstances=" \"$instance\"" + elif [ "$currentLine" -eq "$totalLines" ]; then + # Last line + safariManifestInstances="$safariManifestInstances,\n \"*://$instance/*\"\n" + safariContentInstances="$safariContentInstances,\n \"$instance\"\n" else safariManifestInstances="$safariManifestInstances,\n \"*://$instance/*\"" safariContentInstances="$safariContentInstances,\n \"$instance\"" From d9c0400f9d444006f4b548e3595c9b641ee5855c Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 12:12:43 -0800 Subject: [PATCH 10/17] removed echo --- .github/workflows/instances.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index 34a950881..930d2f8a1 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -61,8 +61,6 @@ jobs: totalLines=$(wc -l < lemmy-instances.txt) currentLine=0 - echo $totalLines - safariManifestInstances="" safariContentInstances="" From 9becb805dfc297b93c0139497f6e5dd0a304adb5 Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 12:22:27 -0800 Subject: [PATCH 11/17] testing return code --- .github/workflows/instances.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index 930d2f8a1..c09feae62 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -127,6 +127,8 @@ jobs: done < "ios/Open In Thunder/Resources/content.js" mv "ios/Open In Thunder/Resources/content-new.js" "ios/Open In Thunder/Resources/content.js" + echo $? + - name: Create Pull Request uses: peter-evans/create-pull-request@v5.0.2 with: From f8e33de43880e72ea819edbe2626a55b1e7c96c6 Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 12:29:31 -0800 Subject: [PATCH 12/17] reverting back --- .github/workflows/instances.yml | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index c09feae62..c09d6331d 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -58,25 +58,18 @@ jobs: mv android/app/src/main/AndroidManifest-new.xml android/app/src/main/AndroidManifest.xml # ---------- Safari Extension ---------- - totalLines=$(wc -l < lemmy-instances.txt) - currentLine=0 - + safariManifestInstances="" safariContentInstances="" + lastLine=true # Generate the Safari extension domains used in manifest.json and content.js # It ignores the last comma in the list to generate proper json while IFS= read -r instance; do - ((currentLine++)) - - if [ "$currentLine" -eq 1 ]; then - # First line + if [ "$lastLine" = true ]; then safariManifestInstances=" \"*://$instance/*\"" - safariContentInstances=" \"$instance\"" - elif [ "$currentLine" -eq "$totalLines" ]; then - # Last line - safariManifestInstances="$safariManifestInstances,\n \"*://$instance/*\"\n" - safariContentInstances="$safariContentInstances,\n \"$instance\"\n" + safariContentInstances=" \"$instance"\" + lastLine=false else safariManifestInstances="$safariManifestInstances,\n \"*://$instance/*\"" safariContentInstances="$safariContentInstances,\n \"$instance\"" @@ -127,14 +120,12 @@ jobs: done < "ios/Open In Thunder/Resources/content.js" mv "ios/Open In Thunder/Resources/content-new.js" "ios/Open In Thunder/Resources/content.js" - echo $? - - name: Create Pull Request uses: peter-evans/create-pull-request@v5.0.2 with: commit-message: Update instances - title: Experimental - Update instances + title: Update instances body: This PR is updating `lemmy-instances.txt`, `instances.dart`, `AndroidManifest.xml`, `manifest.json` and `content.js` with the latest list of instances retrieved from fediverse.observer. - branch: test-update-instances + branch: update-instances delete-branch: true - author: GitHub + author: GitHub \ No newline at end of file From f9a8fb9b6a4e8c9892682a56a48d019ce490b7c5 Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 12:31:34 -0800 Subject: [PATCH 13/17] slowly adding back items --- .github/workflows/instances.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index c09d6331d..a63864306 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -58,6 +58,8 @@ jobs: mv android/app/src/main/AndroidManifest-new.xml android/app/src/main/AndroidManifest.xml # ---------- Safari Extension ---------- + totalLines=$(wc -l < lemmy-instances.txt) + currentLine=0 safariManifestInstances="" safariContentInstances="" From 4ac7cd72857846e5f32a05be1d5fc76c593b3fff Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 12:33:23 -0800 Subject: [PATCH 14/17] slowly adding back items --- .github/workflows/instances.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index a63864306..25163045f 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -68,6 +68,10 @@ jobs: # Generate the Safari extension domains used in manifest.json and content.js # It ignores the last comma in the list to generate proper json while IFS= read -r instance; do + currentLine=$((currentLine + 1)) + + echo currentLine: $currentLine of $totalLines + if [ "$lastLine" = true ]; then safariManifestInstances=" \"*://$instance/*\"" safariContentInstances=" \"$instance"\" From 7302ab40e1d76ee03eba0ebbe7055ef76f0499da Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 12:35:14 -0800 Subject: [PATCH 15/17] slowly adding back items --- .github/workflows/instances.yml | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index 25163045f..e48bfe604 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -72,10 +72,14 @@ jobs: echo currentLine: $currentLine of $totalLines - if [ "$lastLine" = true ]; then + if [ "$currentLine" -eq 1 ]; then + # First line safariManifestInstances=" \"*://$instance/*\"" - safariContentInstances=" \"$instance"\" - lastLine=false + safariContentInstances=" \"$instance\"" + elif [ "$currentLine" -eq "$totalLines" ]; then + # Last line + safariManifestInstances="$safariManifestInstances,\n \"*://$instance/*\"\n" + safariContentInstances="$safariContentInstances,\n \"$instance\"\n" else safariManifestInstances="$safariManifestInstances,\n \"*://$instance/*\"" safariContentInstances="$safariContentInstances,\n \"$instance\"" From 3ef8e0027b9b30aeefb0925a3b90528ad3f1b91d Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 12:37:11 -0800 Subject: [PATCH 16/17] slowly adding back items --- .github/workflows/instances.yml | 3 --- 1 file changed, 3 deletions(-) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index e48bfe604..8f27ae52d 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -63,15 +63,12 @@ jobs: safariManifestInstances="" safariContentInstances="" - lastLine=true # Generate the Safari extension domains used in manifest.json and content.js # It ignores the last comma in the list to generate proper json while IFS= read -r instance; do currentLine=$((currentLine + 1)) - echo currentLine: $currentLine of $totalLines - if [ "$currentLine" -eq 1 ]; then # First line safariManifestInstances=" \"*://$instance/*\"" From 0ee4f78e9ae35c101c6f76e2693a9fa8f38ee6e5 Mon Sep 17 00:00:00 2001 From: Hamlet Jiang Su Date: Tue, 5 Dec 2023 12:42:09 -0800 Subject: [PATCH 17/17] added back newline --- .github/workflows/instances.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/instances.yml b/.github/workflows/instances.yml index 8f27ae52d..b0487c64f 100644 --- a/.github/workflows/instances.yml +++ b/.github/workflows/instances.yml @@ -135,4 +135,4 @@ jobs: body: This PR is updating `lemmy-instances.txt`, `instances.dart`, `AndroidManifest.xml`, `manifest.json` and `content.js` with the latest list of instances retrieved from fediverse.observer. branch: update-instances delete-branch: true - author: GitHub \ No newline at end of file + author: GitHub