getopt added for much beauty

build.sh

@@ -27,6 +27,8 @@ usage: $0 [options] [repo[:tag] ...]
 options:
   --help, -h, -?     Print this help message
   --all              Builds all docker repos specified in LIBRARY
+  --no-clone         Don't pull the git repos
+  --no-build         Don't build, just echo what would have built
 
 variables:
   # where to find repository manifest files
@@ -45,17 +47,46 @@ variables:
 EOUSAGE
 }
 
-# TODO impove arg hanlding for complex args; ex: --exclude=repo:tag
+opts="$(getopt -o 'h?' --long 'all,help,no-build,no-clone' -- "$@" || { usage >&2 && false; })"
-if [ "$1" = '--help' -o "$1" = '-h' -o "$1" = '-?' ]; then
+eval set -- "$opts"
-	usage
+
+doClone=1
+doBuild=1
+buildAll=
+while true; do
+	flag=$1
+	shift
+	case "$flag" in
+		--help|-h|'-?')
+			uasge
 			exit 0
+			;;
+		--all)
+			buildAll=1
+			;;
+		--no-clone)
+			doClone=
+			;;
+		--no-build)
+			doBuild=
+			;;
+		--)
+			break
+			;;
+		*)
+			echo >&2 "error: unknown flag: $flag"
+			usage >&2
+			exit 1
+			;;
+	esac
+done
+
+repos=()
+if [ "$buildAll" ]; then
+	repos=( $(cd "$LIBRARY" && echo *) )
 fi
 
-if [ "$1" = '--all' ]; then
+repos+=( "$@" )
-	repos=( $(cd "$LIBRARY" && echo *) )
-else
-	repos=( "$@" )
-fi
 repos=( "${repos[@]%/}" )
 
 if [ "${#repos[@]}" -eq 0 ]; then
@@ -112,6 +143,12 @@ for repoTag in "${repos[@]}"; do
 		gitRepo="${gitRepo%/}"
 		gitRepo="$SRC/$gitRepo"
 		
+		if [ -z "$doClone" ]; then
+			if [ "$doBuild" -a ! -d "$gitRepo" ]; then
+				echo >&2 "error: directory not found: $gitRepo"
+				exit 1
+			fi
+		else
 			if [ ! -d "$gitRepo" ]; then
 				mkdir -p "$(dirname "$gitRepo")"
 				echo "Cloning '$gitUrl' into '$gitRepo' ..."
@@ -120,6 +157,7 @@ for repoTag in "${repos[@]}"; do
 			else
 				( cd "$gitRepo" && git fetch -q && git fetch -q --tags )
 			fi
+		fi
 		
 		repoGitRepo[$repo:$tag]="$gitRepo"
 		repoGitRef[$repo:$tag]="$gitRef"
@@ -148,6 +186,8 @@ while [ "$#" -gt 0 ]; do
 	fi
 	
 	echo "Processing $repoTag ..."
+	
+	if [ "$doClone" ]; then
 		( cd "$gitRepo" && git clean -dfxq && git checkout -q "$gitRef" && "$dir/git-set-dir-times" )
 		# TODO git tag
 		
@@ -165,7 +205,9 @@ while [ "$#" -gt 0 ]; do
 				fi
 			done
 		done
+	fi
 	
+	if [ "$doBuild" ]; then
 		thisLog="$logDir/build-$repoTag.log"
 		touch "$thisLog"
 		ln -sf "$thisLog" "$latestLogDir/$(basename "$thisLog")"
@@ -174,4 +216,5 @@ while [ "$#" -gt 0 ]; do
 		for namespace in $NAMESPACES; do
 			docker tag "$repoTag" "$namespace/$repoTag"
 		done
+	fi
 done

push.sh

@@ -37,17 +37,39 @@ variables:
 EOUSAGE
 }
 
-# TODO impove arg hanlding for complex args; ex: --exclude=repo:tag
+opts="$(getopt -o 'h?' --long 'all,help' -- "$@" || { usage >&2 && false; })"
-if [ "$1" = '--help' -o "$1" = '-h' -o "$1" = '-?' ]; then
+eval set -- "$opts"
-	usage
+
+buildAll=
+while true; do
+	flag=$1
+	shift
+	case "$flag" in
+		--help|-h|'-?')
+			uasge
 			exit 0
+			;;
+		--all)
+			buildAll=1
+			;;
+		--)
+			shift
+			break
+			;;
+		*)
+			echo >&2 "error: unknown flag: $flag"
+			usage >&2
+			exit 1
+			;;
+	esac
+done
+
+repos=()
+if [ "$buildAll" ]; then
+	repos=( $(cd "$LIBRARY" && echo *) )
 fi
 
-if [ "$1" = '--all' ]; then
+repos+=( "$@" )
-	repos=( $(cd "$LIBRARY" && echo *) )
-else
-	repos=( "$@" )
-fi
 repos=( "${repos[@]%/}" )
 
 if [ "${#repos[@]}" -eq 0 ]; then