build-package.sh accepts tag or branch to build against

dist-utils/build-package.sh

@@ -6,15 +6,24 @@ then DEST_DIR=$(realpath -- "$2")
 else DEST_DIR=$PWD
 fi
 
+if [ -n "$3" ]; then
+	BRANCH="$3"
+else
+	BRANCH=master
+fi
+
 DISTROS_DIR="$(realpath -- "$(dirname -- "$0")/../distros")"
 
 usage() {
-    printf "Usage: %s distro [output directory]\n" "$0"
+    printf "Usage: %s distro [output directory] [version]\n" "$0"
     printf "\ndistro\n\t\tThe name of the distribution to build a package for.\n"
     printf "\noutput directory\n\t\tThe directory where the package should be placed.\n"
     printf "\t\tIf omitted, the CWD is asumed as output directory.\n"
     printf "\nAvailable distros are:\n"
     ls -Qq1 "$DISTROS_DIR" | sed 's/^/ * /g'
+    printf "\nThe version is git branch/tag\n"
+    printf "\t You can see the available branches with git branch -r\n"
+    printf "\t You can see the available tags with git tag -l\n"
     exit 1
 }
 
@@ -25,4 +34,4 @@ fi
 cd "$DISTROS_DIR/$DISTRO" &> /dev/null || usage
 
 source mkconfig.sh
-docker run --privileged --rm -v "$DEST_DIR:/app" -t "$(docker build -q .)" sh -c "(su builduser -c './package.sh') && $COPY_CMD"
+docker run --privileged --rm -v "$DEST_DIR:/app" -t "$(docker build -q .)" sh -c "(su builduser -c \"./package.sh $BRANCH\") && $COPY_CMD"

distros/ArchLinux/PKGBUILD

@@ -34,6 +34,10 @@ pkgver() {
 
 prepare() {
 	cd "$srcdir/${_pkgname}"
+	if [ -n "$BRANCH" ]; then
+		git checkout "$BRANCH"
+	fi
+
 	git submodule update --init
 	make -f release.makefile clean
 }

distros/ArchLinux/package.sh

@@ -2,5 +2,8 @@
 
 # Script to build distro's package
 # check the Dockerfile for any adittional dependencies
+if [ -n "$1" ]; then
+	export BRANCH=$1
+fi
 
-makepkg --clean --syncdeps --noconfirm
+makepkg --clean --syncdeps --noconfirm

distros/Fedora/package.sh

@@ -1,5 +1,8 @@
 #!/bin/bash
+if [ -n "$1" ]; then
+	export BRANCH="$1"
+fi
 
 rpmdev-setuptree
 spectool --get-files -R stremio.spec
-rpmbuild -ba stremio.spec
+rpmbuild -ba stremio.spec

distros/Fedora/stremio.spec.tpl

@@ -30,6 +30,9 @@ git init
 git remote add origin https://github.com/Stremio/stremio-shell.git
 git fetch --all
 git reset --hard origin/master
+if [ -n "$BRANCH" ]; then
+        git checkout "$BRANCH"
+fi
 git submodule update --init
 make -f release.makefile clean
 

distros/Ubuntu/package.sh

@@ -2,6 +2,9 @@
 
 git clone https://github.com/Stremio/stremio-shell.git
 cd stremio-shell
+if [ -n "$1" ]; then
+	git checkout "$1"
+fi
 git submodule update --init
 
 cp dist-utils/common/description ./description-pak