From d7cdefbba66fc7f46e6a5b0cab56927b97f3d85f Mon Sep 17 00:00:00 2001
From: Ben Thomson <git@alfreido.com>
Date: Thu, 11 Jun 2020 12:56:24 +0800
Subject: [PATCH] Fix subsplit repo URL

---
 .../workflows/scripts/subsplit/git-subsplit.sh   | 16 ++++++++++++++--
 .github/workflows/subsplit.yml                   |  2 +-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/scripts/subsplit/git-subsplit.sh b/.github/workflows/scripts/subsplit/git-subsplit.sh
index 32240a071..5d03f351c 100755
--- a/.github/workflows/scripts/subsplit/git-subsplit.sh
+++ b/.github/workflows/scripts/subsplit/git-subsplit.sh
@@ -239,7 +239,7 @@ subsplit_publish()
 
             if [ $RETURNCODE -eq 0 ]
             then
-                PUSH_CMD="git push -q ${DRY_RUN} --force $REMOTE_NAME ${LOCAL_BRANCH}:${HEAD} >/dev/null 2>&1"
+                PUSH_CMD="git push -q ${DRY_RUN} --force $REMOTE_NAME ${LOCAL_BRANCH}:${HEAD}"
 
                 if [ -n "$VERBOSE" ];
                 then
@@ -253,6 +253,12 @@ subsplit_publish()
                 else
                     $PUSH_CMD
                 fi
+
+                PUSHRETURNCODE=$?
+                if [ $PUSHRETURNCODE -eq 0 ]
+                then
+                    say " - completed"
+                fi
             fi
         done
 
@@ -296,7 +302,7 @@ subsplit_publish()
             fi
 
             say " - subtree split for '${TAG}'"
-            git subtree split -q --annotate="${ANNOTATE}" --prefix="$SUBPATH" --branch="$LOCAL_TAG" "$TAG" >/dev/null
+            git subtree split -q --annotate="${ANNOTATE}" --prefix="$SUBPATH" --branch="$LOCAL_TAG" "$TAG" >/dev/null 2>&1
             RETURNCODE=$?
 
             if [ -n "$VERBOSE" ];
@@ -321,6 +327,12 @@ subsplit_publish()
                 else
                     $PUSH_CMD
                 fi
+
+                PUSHRETURNCODE=$?
+                if [ $PUSHRETURNCODE -eq 0 ]
+                then
+                    say " - completed"
+                fi
             fi
         done
     done
diff --git a/.github/workflows/subsplit.yml b/.github/workflows/subsplit.yml
index bd786275d..8974953e8 100644
--- a/.github/workflows/subsplit.yml
+++ b/.github/workflows/subsplit.yml
@@ -12,4 +12,4 @@ jobs:
         with:
           fetch-depth: 0
       - name: Split demo theme
-        run: ${GITHUB_WORKSPACE}/.github/workflows/scripts/subsplit/git-subsplit.sh publish --debug --path="${GITHUB_WORKSPACE}" --heads="${GITHUB_REF/refs\/heads\//}" --no-tags themes/demo:https://bennothommo:${{ secrets.MAINTENANCE_TOKEN }}@github.com:octoberrain/demo-theme.git
+        run: ${GITHUB_WORKSPACE}/.github/workflows/scripts/subsplit/git-subsplit.sh publish --debug --path="${GITHUB_WORKSPACE}" --heads="${GITHUB_REF/refs\/heads\//}" --no-tags themes/demo:https://bennothommo:${{ secrets.MAINTENANCE_TOKEN }}@github.com/octoberrain/demo-theme.git