Robustify scripts

Change-Id: Ie58930822a7b1ca91929df2917da133c2f6b62e8

1 files changed, 11 insertions, 1 deletions

diff --git a/generate-all.sh b/generate-all.sh
index e18421f..ec639b5 100755
--- a/generate-all.sh
+++ b/generate-all.sh
@@ -56,7 +56,17 @@ for a in "${arches[@]}"; do
     done
 done
 
-for a in amd64 arm64 armhf i386; do
+deb_arches ()
+{
+    echo "$@" | sed \
+		    -e "s/x86_64-linux-gnu/amd64/g" \
+		    -e "s/i686-linux-gnu/i386/g" \
+		    -e "s/aarch64-linux-gnu/arm64/g" \
+		    -e "s/arm-linux-gnueabihf/armhf/g"
+}
+
+# Generate tcwg-hack-* images by symlinking to tcwg-build and tcwg-test files.
+for a in $(deb_arches "${arches[@]}"); do
     for d in "${dists[@]}"; do
 	rm -f tcwg-hack-$a-$d.tgz
 	ln -s tcwg-build-$a-$d.tgz tcwg-hack-$a-$d.tgz