Remove "set -x"
This commit is contained in:
parent
640f2b53d6
commit
ec0fa2f93e
6 changed files with 11 additions and 18 deletions
|
@ -40,10 +40,8 @@ if [ ! -e "${gitdir}/.git" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set -x
|
|
||||||
cd "${gitdir}"
|
cd "${gitdir}"
|
||||||
gitexec "fetch origin"
|
gitexec "fetch origin"
|
||||||
gitexec "checkout ${branch}" ||
|
gitexec "checkout ${branch}" ||
|
||||||
gitexec "checkout -t origin/${branch}"
|
gitexec "checkout -t origin/${branch}"
|
||||||
set +x
|
|
||||||
printok "${branch} checked out"
|
printok "${branch} checked out"
|
||||||
|
|
|
@ -11,7 +11,7 @@ branch=$3
|
||||||
|
|
||||||
##
|
##
|
||||||
# functions
|
# functions
|
||||||
gitexec()
|
git()
|
||||||
{
|
{
|
||||||
"${libexec}"/utils/gitexec "${1}"
|
"${libexec}"/utils/gitexec "${1}"
|
||||||
}
|
}
|
||||||
|
@ -41,11 +41,8 @@ if [ -e "${gitdir}/.git" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set -x
|
git clone "${giturl}" "${gitdir}"
|
||||||
gitexec "clone ${giturl} ${gitdir}"
|
|
||||||
cd "${gitdir}"
|
cd "${gitdir}"
|
||||||
gitexec "config core.filemode off"
|
git config core.filemode off
|
||||||
set +x
|
git checkout -t origin/"${branch}"
|
||||||
set +e
|
|
||||||
gitexec "checkout -t origin/${branch} > /dev/null 2>&1"
|
|
||||||
printok "clone complete"
|
printok "clone complete"
|
||||||
|
|
|
@ -49,8 +49,7 @@ perform_install()
|
||||||
! -name ".hooks" \
|
! -name ".hooks" \
|
||||||
! -name ".arcconfig" \
|
! -name ".arcconfig" \
|
||||||
-exec cp -Rpv {} "${installdir}" \;
|
-exec cp -Rpv {} "${installdir}" \;
|
||||||
set -x
|
chown -Rv root "${installdir}"
|
||||||
chown -R root "${installdir}"
|
|
||||||
}
|
}
|
||||||
|
|
||||||
run_install()
|
run_install()
|
||||||
|
@ -73,10 +72,8 @@ if [ "$(id -u)" != "0" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set -x
|
|
||||||
umask ${mode}
|
umask ${mode}
|
||||||
cd "${gitdir}"
|
cd "${gitdir}"
|
||||||
set +x
|
|
||||||
run_install "-d" "${installdir}"
|
run_install "-d" "${installdir}"
|
||||||
chmod ${mode} "${installdir}"
|
chmod ${mode} "${installdir}"
|
||||||
if [ -e "${revfile}" ]; then
|
if [ -e "${revfile}" ]; then
|
||||||
|
@ -85,5 +82,4 @@ else
|
||||||
perform_install
|
perform_install
|
||||||
fi
|
fi
|
||||||
"${libexec}"/utils/git-rev "${gitdir}" > "${revfile}"
|
"${libexec}"/utils/git-rev "${gitdir}" > "${revfile}"
|
||||||
set +x
|
|
||||||
printok "install complete"
|
printok "install complete"
|
||||||
|
|
|
@ -9,9 +9,9 @@ gitdir=$1
|
||||||
|
|
||||||
##
|
##
|
||||||
# functions
|
# functions
|
||||||
gitexec()
|
git()
|
||||||
{
|
{
|
||||||
"${libexec}"/utils/gitexec "${1}"
|
"${libexec}"/utils/git "${@}"
|
||||||
}
|
}
|
||||||
|
|
||||||
printok() {
|
printok() {
|
||||||
|
@ -39,9 +39,7 @@ if [ ! -e "${gitdir}/.git" ]; then
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
set -x
|
|
||||||
cd "${gitdir}"
|
cd "${gitdir}"
|
||||||
branch=$(gitexec "branch --show-current")
|
branch=$(gitexec "branch --show-current")
|
||||||
gitexec "pull --rebase origin ${branch}"
|
gitexec "pull --rebase origin ${branch}"
|
||||||
set +x
|
|
||||||
printok "pull complete"
|
printok "pull complete"
|
||||||
|
|
4
share/portzap/RELNOTES
Normal file
4
share/portzap/RELNOTES
Normal file
|
@ -0,0 +1,4 @@
|
||||||
|
v?.?.?
|
||||||
|
|
||||||
|
| Remove "set -x"
|
||||||
|
After this change, portzap emits less output
|
Loading…
Reference in a new issue