Merge pull request #217 from ajkavanagh/more-22.04-release-changes

More 22.04 release process changes

_charms-git-diff

@@ -1,14 +1,8 @@
 #!/bin/bash -e
 # Get the git status of the charms -- i.e. what has changed
 
-charms="$(cat charms.txt)"
+charms=$(cd charms && ls -d1 *)
 
-for charm in $charms; do
-    if [ ! -d "charms/$charm" ]; then
-        echo "Use ./get-charms master to clone the charm dirs first ($charm not found)"
-        #exit 1
-    fi
-done
 
 for charm in $charms; do
     echo "===== $charm git status ====="

_charms-git-status

@@ -1,14 +1,7 @@
 #!/bin/bash -e
 # Get the git status of the charms -- i.e. what has changed
 
-charms="$(cat charms.txt)"
-
-for charm in $charms; do
-    if [ ! -d "charms/$charm" ]; then
-        echo "Use ./get-charms master to clone the charm dirs first ($charm not found)"
-        #exit 1
-    fi
-done
+charms=$(cd charms && ls -d1 *)
 
 for charm in $charms; do
     echo "===== $charm git status ====="

_do-reset-hard-branch

@@ -1,9 +1,14 @@
 #!/bin/bash -e
 #  Do a reset in all the charms; great for undoing damage and starting again.
 
-charms="$(cat charms.txt)"
+charms=$(cd charms && ls -d1 *)
 branch=$1
 
+if [ -z "$branch" ]; then
+    echo "Please provide the branch name as the param."
+    exit 1
+fi
+
 for charm in $charms; do
     if [ ! -d "charms/$charm" ]; then
         echo "Use ./get-charms master to clone the charm dirs first ($charm not found)"

_do-single-charm-amend-review

@@ -5,6 +5,12 @@
 topic=$1
 script_dir="$( cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
 
+if [ -z "$topic" ]; then
+    echo "Please provide the topic as the only param."
+    echo "Usage $0 <topic>"
+    exit 1
+fi
+
 _dir=$(pwd)
 # verify that the branch isn't master
 branch=$(git branch --show-current | tr -d '\n')
@@ -20,7 +26,7 @@ if [[ -n "$git_status" ]]; then
     echo "Updating, no-edit-amend and git review with topic for ${_dir}"
     git add .
     git commit --amend --no-edit
-    git review -t charmhub-migration-yoga
+    git review -t $topic
 else
     echo "Nothing to do as git repo is not dirty."
 fi

_do-single-charm-review

@@ -0,0 +1,24 @@
+#!/bin/bash -e
+#  git add . then amend no-edit and then review.  Topic in param
+# Does a single charm; use with do-batch-with to do the entire batch.
+
+topic=$1
+script_dir="$( cd "$(dirname "${BASH_SOURCE[0]}" )" && pwd)"
+
+if [ -z "$topic" ]; then
+    echo "Please provide the topic as the only param."
+    echo "Usage $0 <topic>"
+    exit 1
+fi
+
+_dir=$(pwd)
+# verify that the branch isn't master
+branch=$(git branch --show-current | tr -d '\n')
+if [[ "$branch" == "master" ]];
+then
+    echo "Branch is ${_dir}"
+    echo "Branch is master - not updating."
+    exit 0
+fi
+
+git review -t $topic