Get the right branch

Closes coop-cloud/abra#188.
Add shellcheck target
2021-07-04 22:09:18 +02:00 · 2021-07-04 22:09:10 +02:00
2 changed files with 14 additions and 2 deletions
--- a/10
+++ b/10
@ -1,4 +1,12 @@
-.PHONY: build push
+.PHONY: build push shellcheck
+
+shellcheck:
+	@docker run \
+		-it \
+		--rm \
+		-v $$(pwd):/workdir \
+		koalaman/shellcheck-alpine \
+		shellcheck /workdir/plugin.sh

 build:
 	@cd ~/.abra/src && \
--- a/plugin.sh
+++ b/plugin.sh
@ -8,6 +8,10 @@ PLUGIN_BRANCH=${PLUGIN_BRANCH:-main}
 PLUGIN_HOST=${PLUGIN_HOST:-git.autonomic.zone}
 PLUGIN_PORT=${PLUGIN_PORT:-2222}

+checkout_main_or_master() {
+  git checkout main > /dev/null 2>&1 || git checkout master > /dev/null 2>&1
+}
+
 load_deploy_key() {
  echo "--- start ssh key load ---"
  mkdir -p "$HOME/.ssh/"
@ -34,7 +38,7 @@ run_abra_cmd() {
    echo "Automagically detected $recipe as desired recipe repository, cloning now..."

    git clone "https://git.autonomic.zone/coop-cloud/$recipe.git" "/root/.abra/apps/$recipe"
-    cd "/root/.abra/apps/$recipe" && \
+    cd "/root/.abra/apps/$recipe" && checkout_main_or_master && \
      git remote rm origin && \
      git remote add origin "ssh://git@git.autonomic.zone:2222/coop-cloud/$recipe.git"
Author	SHA1	Message	Date
decentral1se	c4bedfb516	Get the right branch continuous-integration/drone/push Build is passing Details Closes coop-cloud/abra#188.	2021-07-04 22:09:18 +02:00
decentral1se	d96289a6a2	Add shellcheck target	2021-07-04 22:09:10 +02:00