Sync with recent sourcezap changes
This commit is contained in:
parent
f514dd4f47
commit
25933cbc85
5 changed files with 9 additions and 8 deletions
|
@ -21,7 +21,7 @@ if [ "$(id -u)" = "0" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! "${libexec}"/utils/isportzap-member > /dev/null 2>&1; then
|
if ! "${libexec}"/utils/isportzap-member; then
|
||||||
printerr "$(id -un) is not a member of _portzap"
|
printerr "$(id -un) is not a member of _portzap"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -22,7 +22,7 @@ if [ "$(id -u)" = "0" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! "${libexec}"/utils/isportzap-member > /dev/null 2>&1; then
|
if ! "${libexec}"/utils/isportzap-member; then
|
||||||
printerr "$(id -un) is not a member of _portzap"
|
printerr "$(id -un) is not a member of _portzap"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -20,7 +20,7 @@ if [ "$(id -u)" = "0" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! "${libexec}"/utils/isportzap-member > /dev/null 2>&1; then
|
if ! "${libexec}"/utils/isportzap-member; then
|
||||||
printerr "$(id -un) is not a member of _portzap"
|
printerr "$(id -un) is not a member of _portzap"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -20,15 +20,16 @@ if [ "$(id -u)" = "0" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if ! "${libexec}"/utils/isportzap-member; then
|
||||||
|
printerr "$(id -un) is not a member of _portzap"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
if [ ! -e "${gitdir}" ]; then
|
if [ ! -e "${gitdir}" ]; then
|
||||||
printerr "try 'portzap clone' instead"
|
printerr "try 'portzap clone' instead"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! "${libexec}"/utils/isportzap-member; then
|
|
||||||
printerr "$(id -un) is not a member of _portzap"
|
|
||||||
fi
|
|
||||||
|
|
||||||
cd "${gitdir}"
|
cd "${gitdir}"
|
||||||
doas -n \
|
doas -n \
|
||||||
-u "${user}" \
|
-u "${user}" \
|
||||||
|
|
|
@ -5,5 +5,5 @@ set -e
|
||||||
# main
|
# main
|
||||||
group="_portzap"
|
group="_portzap"
|
||||||
mygroups=$(id -Gn | tr ' ' '\n')
|
mygroups=$(id -Gn | tr ' ' '\n')
|
||||||
echo "${mygroups}" | grep -e "^${group}$"
|
echo "${mygroups}" | grep -e "^${group}$" > /dev/null 2>&1
|
||||||
exit "${?}"
|
exit "${?}"
|
||||||
|
|
Loading…
Reference in a new issue