require --variant parameter

This commit is contained in:
Eric House 2022-08-10 18:18:08 -07:00
parent 0e9235dcd0
commit 12511755a8
2 changed files with 7 additions and 7 deletions

View file

@ -2,11 +2,10 @@
set -e -u set -e -u
VARIANT=Xw4Foss
usage () { usage () {
echo "usage: $(basename $0) [--tag tagname | --branch branchname] \\" [ "$#" -gt 1 ] && echo "ERROR: $1"
echo " [--variant VARIANT] # default value: $VARIANT \\" echo "usage: $(basename $0) --variant VARIANT \\"
echo " [--tag tagname | --branch branchname] \\"
echo " # (uses current branch as default)" echo " # (uses current branch as default)"
echo " # e.g. $0 --tag android_beta_141 --variant Xw4d" echo " # e.g. $0 --tag android_beta_141 --variant Xw4d"
echo "Here are some possible variants:" echo "Here are some possible variants:"
@ -40,7 +39,9 @@ while [ 0 -lt $# ] ; do
shift shift
done done
if [ -n "$TAG" ]; then if [ -z "${VARIANT-}" ]; then
usage "param --variant is not optional"
elif [ -n "$TAG" ]; then
if ! git tag | grep -w "$TAG"; then if ! git tag | grep -w "$TAG"; then
echo "tag $TAG not found" echo "tag $TAG not found"
usage usage

View file

@ -2,7 +2,6 @@
set -u -e set -u -e
VARIANT=Xw4Foss
TAGNAME="" TAGNAME=""
FILES="" FILES=""
LIST_FILE='' LIST_FILE=''
@ -12,7 +11,7 @@ XW_RELEASE_SCP_DEST=${XW_RELEASE_SCP_DEST:-""}
usage() { usage() {
echo "Error: $*" >&2 echo "Error: $*" >&2
echo "usage: $0 [--tag <name>] [--apk-list path/to/out.txt] \\" echo "usage: $0 [--tag <name>] [--apk-list path/to/out.txt] \\"
echo " [--variant VARIANT] # default value: $VARIANT \\" echo " --variant <VARIANT> "
echo " [<package-unsigned.apk>]" >&2 echo " [<package-unsigned.apk>]" >&2
exit 1 exit 1
} }