Merge branch 'master' of https://github.com/Fabian42/bash_scripts

Fabian42 · Dec 18, 2023 · a29a429 · a29a429
2 parents 5e00235 + 4d781ad
commit a29a429
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/.github/workflows/temp.yml b/.github/workflows/temp.yml
@@ -6,9 +6,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - run: |
-          echo "{"keywords":[" > temp.json
-          cat temp | sed -E "s/(^|[^\\\\\\n])((\\\\\\\\)*) *\\#.+/\\1\\2/;s/(.+)/ {\"keyword\":\"\\1\"},/" >> temp.json
-          echo "]}" > temp.json
+          echo "{\"keywords\":[" > temp.json
+          cat temp | sed -E "s/(^|[^\\\\\\n])((\\\\\\\\)*) *\\#.+/\\1\\2/;$ ! s/(.+)/ {\"keyword\":\"\\1\"},/;$ s/(.+)/ {\"keyword\":\"\\1\"}/;/^ *$/d" >> temp.json
+          echo >> temp.json
+          echo "]}" >> temp.json
           git config --global user.name "Fabian42"
           git config --global user.email "[email protected]"
           git add .

diff --git a/temp b/temp
@@ -8,4 +8,4 @@ foo
 \\# comment
 \\\# hash
 \\\\# comment
-\\\\\# hash
+\\\\\# hashtesting
diff --git a/temp.json b/temp.json
@@ -1,2 +1,13 @@
 {"keywords":[
+<<<<<<< HEAD
+=======
+ {"keyword":"test"},
+ {"keyword":"abc"},
+ {"keyword":"foo"},
+ {"keyword":"\# hash"},
+ {"keyword":"\\"},
+ {"keyword":"\\\# hash"},
+ {"keyword":"\\\\"},
+ {"keyword":"\\\\\# hashtesting"}
+>>>>>>> 4d781ad2c9a562e693caf5d259f933c8c575ff21
 ]}