Add utils/git directory
Group git-related utilities under one directory. The utils/git/run script runs git as the '_sourcezap' user, and it is how we talk to git.
This commit is contained in:
parent
d4a18461ca
commit
d33cd6628f
9 changed files with 19 additions and 45 deletions
|
@ -12,7 +12,7 @@ branch=$2
|
||||||
# functions
|
# functions
|
||||||
git()
|
git()
|
||||||
{
|
{
|
||||||
"${libexec}"/utils/git "${@}"
|
"${libexec}"/utils/git/run "${@}"
|
||||||
}
|
}
|
||||||
|
|
||||||
printok()
|
printok()
|
||||||
|
@ -38,7 +38,7 @@ if ! "${libexec}"/utils/issourcezap-member > /dev/null 2>&1; then
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [ ! -e "${gitdir}/.git" ]; then
|
if [ ! -e "${gitdir}/.git" ]; then
|
||||||
printerr "try 'portzap clone' instead"
|
printerr "try 'sourcezap clone' instead"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -13,7 +13,7 @@ branch=$3
|
||||||
# functions
|
# functions
|
||||||
git()
|
git()
|
||||||
{
|
{
|
||||||
"${libexec}"/utils/git "${@}"
|
"${libexec}"/utils/git/run "${@}"
|
||||||
}
|
}
|
||||||
|
|
||||||
printok()
|
printok()
|
||||||
|
|
|
@ -15,8 +15,8 @@ revfile=$3
|
||||||
perform_update()
|
perform_update()
|
||||||
{
|
{
|
||||||
rev=$(cat "${revfile}")
|
rev=$(cat "${revfile}")
|
||||||
add=$("${libexec}"/utils/git-changed-files "${gitdir}" "${rev}")
|
add=$("${libexec}"/utils/git/get-changed-files "${gitdir}" "${rev}")
|
||||||
del=$("${libexec}"/utils/git-removed-files "${gitdir}" "${rev}")
|
del=$("${libexec}"/utils/git/get-removed-files "${gitdir}" "${rev}")
|
||||||
for file in ${del}; do
|
for file in ${del}; do
|
||||||
target="${installdir}/${file}"
|
target="${installdir}/${file}"
|
||||||
parent=$(dirname "${target}")
|
parent=$(dirname "${target}")
|
||||||
|
@ -63,6 +63,11 @@ run_install()
|
||||||
install -o root -g _sourcezap -m "${mode}" -v "$@"
|
install -o root -g _sourcezap -m "${mode}" -v "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
git()
|
||||||
|
{
|
||||||
|
"${libexec}"/utils/git/run "${@}"
|
||||||
|
}
|
||||||
|
|
||||||
printok()
|
printok()
|
||||||
{
|
{
|
||||||
"${libexec}"/utils/printok "${1}"
|
"${libexec}"/utils/printok "${1}"
|
||||||
|
@ -91,5 +96,5 @@ if [ -e "${revfile}" ]; then
|
||||||
else
|
else
|
||||||
perform_install
|
perform_install
|
||||||
fi
|
fi
|
||||||
"${libexec}"/utils/git-rev "${gitdir}" > "${revfile}"
|
"${libexec}"/utils/git/run rev-parse HEAD > "${revfile}"
|
||||||
printok "install complete"
|
printok "install complete"
|
||||||
|
|
|
@ -11,7 +11,7 @@ gitdir=$1
|
||||||
# functions
|
# functions
|
||||||
git()
|
git()
|
||||||
{
|
{
|
||||||
"${libexec}"/utils/git "${@}"
|
"${libexec}"/utils/git/run "${@}"
|
||||||
}
|
}
|
||||||
|
|
||||||
printok()
|
printok()
|
||||||
|
|
|
@ -1,20 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
##
|
|
||||||
# variables
|
|
||||||
localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
|
|
||||||
libexec="${localbase}"/libexec/sourcezap
|
|
||||||
gitdir=$1
|
|
||||||
|
|
||||||
##
|
|
||||||
# functions
|
|
||||||
git()
|
|
||||||
{
|
|
||||||
"${libexec}"/utils/git "${1}"
|
|
||||||
}
|
|
||||||
|
|
||||||
##
|
|
||||||
# main
|
|
||||||
cd "${gitdir}"
|
|
||||||
git rev-parse HEAD
|
|
|
@ -10,13 +10,13 @@ commit=$2
|
||||||
|
|
||||||
##
|
##
|
||||||
# functions
|
# functions
|
||||||
diff()
|
git()
|
||||||
{
|
{
|
||||||
"${libexec}"/utils/gitdiff ${@}
|
"${libexec}"/utils/git/run "${@}"
|
||||||
}
|
}
|
||||||
|
|
||||||
##
|
##
|
||||||
# main
|
# main
|
||||||
cd "${gitdir}"
|
cd "${gitdir}"
|
||||||
diff "--name-only" "--diff-filter=A" "${commit}" "HEAD"
|
git diff -l0 --name-only --diff-filter=A "${commit}" "HEAD"
|
||||||
diff "--name-only" "--diff-filter=M" "${commit}" "HEAD"
|
git diff -l0 --name-only --diff-filter=M "${commit}" "HEAD"
|
|
@ -10,12 +10,12 @@ commit=$2
|
||||||
|
|
||||||
##
|
##
|
||||||
# functions
|
# functions
|
||||||
diff()
|
git()
|
||||||
{
|
{
|
||||||
"${libexec}"/utils/gitdiff ${@}
|
"${libexec}"/utils/git/run "${@}"
|
||||||
}
|
}
|
||||||
|
|
||||||
##
|
##
|
||||||
# main
|
# main
|
||||||
cd "${gitdir}"
|
cd "${gitdir}"
|
||||||
diff "--name-only" "--diff-filter=D" "${commit}" "HEAD"
|
git diff -l0 --name-only --diff-filter=D "${commit}" "HEAD"
|
|
@ -1,11 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
set -e
|
|
||||||
|
|
||||||
##
|
|
||||||
# variables
|
|
||||||
localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)}
|
|
||||||
libexec="${localbase}"/libexec/sourcezap
|
|
||||||
|
|
||||||
##
|
|
||||||
# main
|
|
||||||
"${libexec}"/utils/git diff -l0 ${@}
|
|
Loading…
Reference in a new issue