Merge pull request #12 from xtqqczze/long-options

zeke · web-flow · commit 4dc03b41e0b5 · 2020-03-04T21:21:51.000-08:00
style: use long options for command line arguments
diff --git a/entrypoint.sh b/entrypoint.sh
@@ -10,13 +10,13 @@ fi
 if [[ ! -z "$SSH_PRIVATE_KEY" ]]; then
   echo "Saving SSH_PRIVATE_KEY"
 
-  mkdir -p /root/.ssh
+  mkdir --parents /root/.ssh
   echo "$SSH_PRIVATE_KEY" > /root/.ssh/id_rsa
   chmod 600 /root/.ssh/id_rsa
 
   # Github action changes $HOME to /github at runtime
   # therefore we always copy the SSH key to $HOME (aka. ~)
-  mkdir -p ~/.ssh
+  mkdir --parents ~/.ssh
   cp /root/.ssh/* ~/.ssh/ 2> /dev/null || true 
 fi
 
diff --git a/github-sync.sh b/github-sync.sh
@@ -27,7 +27,7 @@ echo "BRANCHES=$BRANCH_MAPPING"
 git remote set-url origin "https://$GITHUB_ACTOR:$GITHUB_TOKEN@github.com/$GITHUB_REPOSITORY"
 git remote add tmp_upstream "$UPSTREAM_REPO"
 git fetch tmp_upstream
-git remote -v
-git push origin "refs/remotes/tmp_upstream/${BRANCH_MAPPING%%:*}:refs/heads/${BRANCH_MAPPING#*:}" -f
+git remote --verbose
+git push origin "refs/remotes/tmp_upstream/${BRANCH_MAPPING%%:*}:refs/heads/${BRANCH_MAPPING#*:}" --force
 git remote rm tmp_upstream
-git remote -v
+git remote --verbose
