crater2150/scripts
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

xrestricted: Allow specifying a branch to use instead of master

Browse source
This commit is contained in:
Alexander Gehrke 2022-08-31 15:33:22 +02:00
parent dc941fb24c
commit df5e54bbaf
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
void/xrestricted
View file

@ -20,7 +20,7 @@ if [[ ! -d $PACKAGES_DIR ]]; then
exit 1 exit 1
fi fi
zparseopts -D -E h=help -help=help j:=jobs -jobs:=jobs zparseopts -D -E h=help -help=help j:=jobs -jobs:=jobs b:=branch -branch:=branch
if [[ $help ]]; then if [[ $help ]]; then
<<-HELP <<-HELP
@ -30,6 +30,10 @@ if [[ $help ]]; then
Install restricted packages from a void source repo. Detected repo at: Install restricted packages from a void source repo. Detected repo at:
$VOID_PACKAGES_DIR $VOID_PACKAGES_DIR
Common options:
-j, --jobs N Number of jobs to use
-b, --branch B Use given branch instead of master
HELP HELP
exit exit
fi fi
@ -40,19 +44,20 @@ fi
cd $PACKAGES_DIR cd $PACKAGES_DIR
branch=${branch[2]:-master}
check "Checking git branch..." check "Checking git branch..."
if [[ $(git rev-parse --abbrev-ref HEAD) != master ]]; then if [[ $(git rev-parse --abbrev-ref HEAD) != $branch ]]; then
if ! git diff --quiet; then if ! git diff --quiet; then
fail "not on master and working directory dirty, please fix manually" fail "not on $branch and working directory dirty, please fix manually"
exit 1 exit 1
else else
warn "not on master" warn "not on $branch"
check "checking out master ..." check "checking out $branch ..."
output=$(git checkout master 2>&1) output=$(git checkout $branch 2>&1)
[[ $? == 0 ]] && succeed || { fail $output && exit 1 } [[ $? == 0 ]] && succeed || { fail $output && exit 1 }
fi fi
else else
succeed "on master" succeed "on $branch"
fi fi
packages=( $(ag -G 'template' restricted=yes srcpkgs/ | cut -d/ -f 2 | sort -u) ) packages=( $(ag -G 'template' restricted=yes srcpkgs/ | cut -d/ -f 2 | sort -u) )