add setup.sh

Author: umarcor

build.sh

@@ -1,12 +1,6 @@
 #!/bin/bash
-set -e
 
-podman=`which podman || true`
-
-if [ -z $podman ]; then
-  echo "podman needs to be in PATH for this script to work."
-  exit 1
-fi
+source $(dirname "$0")/setup.sh
 
 if [ -z "$1" -o -z "$2" ]; then
   echo "Usage: $0 <godot branch> <base distro>"
@@ -74,7 +68,7 @@ if [ ! -e "${files_root}"/MacOSX${OSX_SDK}.sdk.tar.xz ] || [ ! -e "${files_root}
 
   echo "Building OSX and iOS SDK packages. This will take a while"
   podman_build xcode
-  $podman run -it --rm \
+  "$podman" run -it --rm \
     -v "${files_root}":/root/files:z \
     -e XCODE_SDKV="${XCODE_SDK}" \
     -e OSX_SDKV="${OSX_SDK}" \

setup.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+set -e
+
+podman=`which podman || true`
+
+if [ -z "$podman" ]; then
+  echo "podman needs to be in PATH for this script to work."
+  exit 1
+fi

upload.sh

@@ -1,11 +1,6 @@
 #!/bin/bash
 
-set -e
-
-podman=podman
-if ! which $podman; then
-  podman=docker
-fi
+source $(dirname "$0")/setup.sh
 
 img_version=$1
 registry=$2
@@ -19,13 +14,13 @@ if [ -z "${registry}" ]; then
   registry=registry.prehensile-tales.com
 fi
 
-$podman push godot-export:${img_version} ${registry}/godot/export
-$podman push godot-linux:${img_version} ${registry}/godot/linux
-$podman push godot-windows:${img_version} ${registry}/godot/windows
-$podman push godot-web:${img_version} ${registry}/godot/web
-$podman push godot-xcode:${img_version} ${registry}/godot/xcode
+"$podman" push godot-export:${img_version} ${registry}/godot/export
+"$podman" push godot-linux:${img_version} ${registry}/godot/linux
+"$podman" push godot-windows:${img_version} ${registry}/godot/windows
+"$podman" push godot-web:${img_version} ${registry}/godot/web
+"$podman" push godot-xcode:${img_version} ${registry}/godot/xcode
 
-$podman push godot-android:${img_version} ${registry}/godot-private/android
-$podman push godot-ios:${img_version} ${registry}/godot-private/ios
-$podman push godot-osx:${img_version} ${registry}/godot-private/macosx
-$podman push godot-msvc:${img_version} ${registry}/godot-private/uwp
+"$podman" push godot-android:${img_version} ${registry}/godot-private/android
+"$podman" push godot-ios:${img_version} ${registry}/godot-private/ios
+"$podman" push godot-osx:${img_version} ${registry}/godot-private/macosx
+"$podman" push godot-msvc:${img_version} ${registry}/godot-private/uwp