Use long form for cli args (#565)

* Replace `mkdir`'s `-p` with `--parents`

* Replace `rm`'s `-d` with `--dir`

* Replace `mv`'s `-v` with `--verbose`

* Replace `sed`'s `-i` with `--in-place`

* Replace `wget`'s `-O` with `--output-document`

.github/workflows/build.yml

@@ -20,24 +20,24 @@ jobs:
   build-northstar:
     runs-on: ubuntu-20.04
     steps:
-      - name: Wait for launcher release build to be ready
-        timeout-minutes: 30 # Only wait for 30 minutes. If we take longer, something probably broke
-        run:
-          bash wait_dl.sh
-      - name: Download compiled launcher
-        run:
-          wget "https://github.com/R2Northstar/NorthstarLauncher/releases/download/${{ env.NORTHSTAR_VERSION }}/northstar-launcher.zip"
-      - name: Download DiscordRPC plugin
-        run:
-          wget "https://github.com/R2Northstar/NorthstarDiscordRPC/releases/download/v4/northstar-discord-rpc.zip"
-      - name: Download compiled stubs
-        run:
-          wget "https://github.com/R2Northstar/NorthstarStubs/releases/download/v1/NorthstarStubs.zip"
       - name: Checkout release files
         uses: actions/checkout@v3
         with:
           ref: ${{ env.NORTHSTAR_VERSION }}
           path: northstar
+      - name: Wait for launcher release build to be ready
+        timeout-minutes: 30 # Only wait for 30 minutes. If we take longer, something probably broke
+        run:
+          bash northstar/wait_for_launcher_dl.sh $NORTHSTAR_VERSION
+      - name: Download compiled launcher
+        run:
+          wget "https://github.com/R2Northstar/NorthstarLauncher/releases/download/${{ env.NORTHSTAR_VERSION }}/northstar-launcher.zip"
+      - name: Download DiscordRPC plugin
+        run:
+          wget "https://github.com/R2Northstar/NorthstarDiscordRPC/releases/download/v5/northstar-discord-rpc.zip"
+      - name: Download compiled stubs
+        run:
+          wget "https://github.com/R2Northstar/NorthstarStubs/releases/download/v1/NorthstarStubs.zip"
       - name: Checkout core mods
         uses: actions/checkout@v3
         with:
@@ -57,11 +57,11 @@ jobs:
           git ls-tree -r $NORTHSTAR_VERSION --name-only | xargs -L1 md5sum >> md5sum.txt
       - name: Make folder structure
         run: |
-          mv -v northstar/release/* northstar/.
+          mv --verbose northstar/release/* northstar/.
-          rm -d northstar/release
+          rm --dir northstar/release
-          mkdir -p northstar/R2Northstar/mods
+          mkdir --parents northstar/R2Northstar/mods
-          mkdir -p northstar/R2Northstar/plugins
+          mkdir --parents northstar/R2Northstar/plugins
-          mkdir -p northstar/bin/x64_dedi
+          mkdir --parents northstar/bin/x64_dedi
 
           unzip northstar-discord-rpc.zip -d northstar/R2Northstar/plugins
 
@@ -76,13 +76,13 @@ jobs:
           path: northstar-navs
       - name: Navmeshes setup
         run: |
-          mkdir -p northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
+          mkdir --parents northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
-          mv -v northstar-navs/graphs northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
+          mv --verbose northstar-navs/graphs northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
-          mv -v northstar-navs/navmesh northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
+          mv --verbose northstar-navs/navmesh northstar/R2Northstar/mods/Northstar.CustomServers/mod/maps
       - name: Cleanup root Northstar repository files
         working-directory: northstar
         run: |
-          rm -rf .git .github .gitignore *.md LICENSE thunderstore .ci.env.example
+          rm -rf .git .github .gitignore *.md LICENSE thunderstore .ci.env.example *.sh
       - name: Upload
         uses: actions/upload-artifact@v3
         with:
@@ -122,14 +122,14 @@ jobs:
     steps:
       - name: Setup tcli
         run: |
-          wget -O tcli.tar.gz https://github.com/thunderstore-io/thunderstore-cli/releases/download/0.1.4/tcli-0.1.4-linux-x64.tar.gz
+          wget --output-document tcli.tar.gz https://github.com/thunderstore-io/thunderstore-cli/releases/download/0.1.4/tcli-0.1.4-linux-x64.tar.gz
           tar xvf tcli.tar.gz
-          sudo mv -v tcli-0.1.4-linux-x64/tcli /bin
+          sudo mv --verbose tcli-0.1.4-linux-x64/tcli /bin
 
       - name: (DEBUG) Download Northstar package
         if: ${{ env.ACT }} # Download Northstar package from releases when running locally instead of relying on previous jobs
         run: |
-          wget -O northstar.zip https://github.com/R2Northstar/Northstar/releases/download/v1.6.3/Northstar.release.v1.6.3.zip
+          wget --output-document northstar.zip https://github.com/R2Northstar/Northstar/releases/download/v1.6.3/Northstar.release.v1.6.3.zip
           unzip northstar.zip -d northstar
 
       - name: Download Northstar package
@@ -141,10 +141,10 @@ jobs:
 
       - name: Make package structure
         run: |
-          mkdir -p thunderstore/dist/Northstar
+          mkdir --parents thunderstore/dist/Northstar
-          mv -v northstar/* thunderstore/dist/Northstar
+          mv --verbose northstar/* thunderstore/dist/Northstar
-          wget -O thunderstore/icon.png https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/icon.png
+          wget --output-document thunderstore/icon.png https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/icon.png
-          wget -O thunderstore/README.md https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/README.md
+          wget --output-document thunderstore/README.md https://raw.githubusercontent.com/R2Northstar/Northstar/main/thunderstore/README.md
 
       - name: Setup environment variables
         run: |
@@ -167,9 +167,9 @@ jobs:
         run: |
           tcli init --package-name=$TS_MOD_NAME --package-namespace=$TS_NAMESPACE --package-version $MOD_VERSION
 
-          sed -i "s/communities = \[\]/communities = [\"$TS_COMMUNITY\"]/g" thunderstore.toml
+          sed --in-place "s/communities = \[\]/communities = [\"$TS_COMMUNITY\"]/g" thunderstore.toml
-          sed -i "s/Example-Dependency = \"1.0.0\"//g" thunderstore.toml
+          sed --in-place "s/Example-Dependency = \"1.0.0\"//g" thunderstore.toml
-          sed -i "s/description = \"Example mod description\"/description = \"$TS_MOD_DESCRIPTION\"/g" thunderstore.toml
+          sed --in-place "s/description = \"Example mod description\"/description = \"$TS_MOD_DESCRIPTION\"/g" thunderstore.toml
           cat thunderstore.toml
 
           tcli build

wait_for_launcher_dl.sh

@@ -6,14 +6,14 @@ if [ -z "$1" ]; then
     exit 1
 fi
 
-url="https://github.com/R2Northstar/NorthstarLauncher/releases/tag/$1"
+url="https://github.com/R2Northstar/NorthstarLauncher/releases/download/$1/northstar-launcher.zip"
 wait_time_seconds=60
 
 # Loop until the response code changes
 while true; do
     response=$(curl --silent --output /dev/null --write-out "%{http_code}" $url)
-    if [ $response -ne 200 ]; then
+    if [ $response -eq 404 ]; then
-        echo "Response is not 200. Retrying in $wait_time_seconds seconds."
+        echo "Response is 404. Retrying in $wait_time_seconds seconds."
         sleep $wait_time_seconds
     else
         echo "Site is accessible with response code $response."