From 218dbcad158ff4f4fc021d448646fc4056e6e862 Mon Sep 17 00:00:00 2001 From: 0x1eef <0x1eef@protonmail.com> Date: Tue, 20 Aug 2024 02:00:51 -0300 Subject: [PATCH] s|gitdir|repodir|g, s|giturl|repourl|g --- libexec/portzap/commands/portzap-checkout | 6 +++--- libexec/portzap/commands/portzap-clone | 10 +++++----- libexec/portzap/commands/portzap-install | 8 ++++---- libexec/portzap/commands/portzap-pull | 6 +++--- libexec/portzap/commands/portzap-rm | 10 +++++----- libexec/portzap/commands/portzap-sh | 6 +++--- libexec/portzap/utils/git/get-changed-files | 4 ++-- libexec/portzap/utils/git/get-removed-files | 4 ++-- libexec/portzap/utils/install/update-changed-files | 6 +++--- libexec/portzap/utils/install/update-deleted-files | 6 +++--- 10 files changed, 33 insertions(+), 33 deletions(-) diff --git a/libexec/portzap/commands/portzap-checkout b/libexec/portzap/commands/portzap-checkout index 221b75f..34c3bcb 100755 --- a/libexec/portzap/commands/portzap-checkout +++ b/libexec/portzap/commands/portzap-checkout @@ -6,7 +6,7 @@ set -e localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)} libexec="${localbase}"/libexec/portzap git="${libexec}"/utils/git/run -gitdir=$1 +repodir=$1 branch=$2 ## @@ -26,12 +26,12 @@ if ! "${libexec}"/utils/isportzap-member; then exit 1 fi -if [ ! -e "${gitdir}/.git" ]; then +if [ ! -e "${repodir}/.git" ]; then printerr "try 'portzap clone' instead" exit 1 fi -cd "${gitdir}" +cd "${repodir}" "${git}" fetch origin "${git}" checkout "${branch}" || "${git}" checkout -t origin/"${branch}" diff --git a/libexec/portzap/commands/portzap-clone b/libexec/portzap/commands/portzap-clone index 4001542..ec7d224 100755 --- a/libexec/portzap/commands/portzap-clone +++ b/libexec/portzap/commands/portzap-clone @@ -6,8 +6,8 @@ set -e localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)} libexec="${localbase}"/libexec/portzap git="${libexec}"/utils/git/run -giturl=$1 -gitdir=$2 +repourl=$1 +repodir=$2 branch=$3 ## @@ -27,13 +27,13 @@ if ! "${libexec}"/utils/isportzap-member; then exit 1 fi -if [ -e "${gitdir}/.git" ]; then +if [ -e "${repodir}/.git" ]; then printerr "try 'portzap pull' instead" exit 1 fi -"${git}" clone "${giturl}" "${gitdir}" -cd "${gitdir}" +"${git}" clone "${repourl}" "${repodir}" +cd "${repodir}" "${git}" config core.filemode off "${git}" checkout -t origin/"${branch}" > /dev/null 2>&1 || true printok "clone complete" diff --git a/libexec/portzap/commands/portzap-install b/libexec/portzap/commands/portzap-install index bbca9f0..2b31a5e 100755 --- a/libexec/portzap/commands/portzap-install +++ b/libexec/portzap/commands/portzap-install @@ -7,7 +7,7 @@ localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)} libexec="${localbase}"/libexec/portzap git="${libexec}"/utils/git/run mask=$("${libexec}"/utils/get-umask) -gitdir=$1 +repodir=$1 installdir=$2 revfile=$3 @@ -23,14 +23,14 @@ if [ "$(id -u)" != "0" ]; then exit 1 fi -cd "${gitdir}" +cd "${repodir}" if [ -e "${revfile}" ]; then ## # install update rev=$(cat "${revfile}") "${libexec}"/utils/install/run -d "${installdir}" - "${libexec}"/utils/install/update-deleted-files "${gitdir}" "${installdir}" "${rev}" - "${libexec}"/utils/install/update-changed-files "${gitdir}" "${installdir}" "${rev}" + "${libexec}"/utils/install/update-deleted-files "${repodir}" "${installdir}" "${rev}" + "${libexec}"/utils/install/update-changed-files "${repodir}" "${installdir}" "${rev}" else ## # install from scratch diff --git a/libexec/portzap/commands/portzap-pull b/libexec/portzap/commands/portzap-pull index 2acdfc2..7711e0b 100755 --- a/libexec/portzap/commands/portzap-pull +++ b/libexec/portzap/commands/portzap-pull @@ -6,7 +6,7 @@ set -e localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)} libexec="${localbase}"/libexec/portzap git="${libexec}"/utils/git/run -gitdir=$1 +repodir=$1 ## # functions @@ -25,12 +25,12 @@ if ! "${libexec}"/utils/isportzap-member; then exit 1 fi -if [ ! -e "${gitdir}/.git" ]; then +if [ ! -e "${repodir}/.git" ]; then printerr "try 'portzap clone' instead" exit 1 fi -cd "${gitdir}" +cd "${repodir}" branch=$("${git}" branch --show-current) "${git}" pull --rebase origin "${branch}" printok "pull complete" diff --git a/libexec/portzap/commands/portzap-rm b/libexec/portzap/commands/portzap-rm index d5253cb..a859348 100755 --- a/libexec/portzap/commands/portzap-rm +++ b/libexec/portzap/commands/portzap-rm @@ -5,7 +5,7 @@ set -e # variables localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)} libexec="${localbase}"/libexec/portzap -gitdir=$1 +repodir=$1 installdir=$2 ## @@ -34,19 +34,19 @@ if [ "$(id -u)" != "0" ]; then exit 1 fi -printf "1 Remove the contents of %s\n" "${gitdir}" +printf "1 Remove the contents of %s\n" "${repodir}" printf "2 Remove the contents of %s\n" "${installdir}" -printf "3 Remove the contents of both (%s and %s)\n" "${gitdir}" "${installdir}" +printf "3 Remove the contents of both (%s and %s)\n" "${repodir}" "${installdir}" printf "4 Do nothing\n" printf "1-4: " while true; do read -r r if [ "${r}" = "1" ]; then - erase "${gitdir}" + erase "${repodir}" elif [ "${r}" = "2" ]; then erase "${installdir}" elif [ "${r}" = "3" ]; then - erase "${gitdir}" + erase "${repodir}" erase "${installdir}" elif [ "${r}" = "4" ]; then break diff --git a/libexec/portzap/commands/portzap-sh b/libexec/portzap/commands/portzap-sh index 1767347..7baa87f 100755 --- a/libexec/portzap/commands/portzap-sh +++ b/libexec/portzap/commands/portzap-sh @@ -6,7 +6,7 @@ set -e localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../..)} libexec="${localbase}"/libexec/portzap user=_portzap -gitdir="${1}" +repodir="${1}" ## # functions @@ -25,12 +25,12 @@ if ! "${libexec}"/utils/isportzap-member; then exit 1 fi -if [ ! -e "${gitdir}" ]; then +if [ ! -e "${repodir}" ]; then printerr "try 'portzap clone' instead" exit 1 fi -cd "${gitdir}" +cd "${repodir}" doas -n \ -u "${user}" \ /bin/sh diff --git a/libexec/portzap/utils/git/get-changed-files b/libexec/portzap/utils/git/get-changed-files index 7c64d41..d890d81 100755 --- a/libexec/portzap/utils/git/get-changed-files +++ b/libexec/portzap/utils/git/get-changed-files @@ -6,11 +6,11 @@ set -e localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)} libexec="${localbase}"/libexec/portzap git="${libexec}"/utils/git/run -gitdir=$1 +repodir=$1 commit=$2 ## # main -cd "${gitdir}" +cd "${repodir}" "${git}" diff -l0 --name-only --diff-filter=A "${commit}" "HEAD" "${git}" diff -l0 --name-only --diff-filter=M "${commit}" "HEAD" diff --git a/libexec/portzap/utils/git/get-removed-files b/libexec/portzap/utils/git/get-removed-files index 4ad32dc..3142f21 100755 --- a/libexec/portzap/utils/git/get-removed-files +++ b/libexec/portzap/utils/git/get-removed-files @@ -6,10 +6,10 @@ set -e localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)} libexec="${localbase}"/libexec/portzap git="${libexec}"/utils/git/run -gitdir=$1 +repodir=$1 commit=$2 ## # main -cd "${gitdir}" +cd "${repodir}" "${git}" diff -l0 --name-only --diff-filter=D "${commit}" "HEAD" diff --git a/libexec/portzap/utils/install/update-changed-files b/libexec/portzap/utils/install/update-changed-files index 799dc2f..e31cfe2 100755 --- a/libexec/portzap/utils/install/update-changed-files +++ b/libexec/portzap/utils/install/update-changed-files @@ -5,14 +5,14 @@ set -e # variables localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)} libexec="${localbase}"/libexec/portzap -gitdir=$1 +repodir=$1 installdir=$2 rev=$3 ## # main -cd "${gitdir}" -files=$("${libexec}"/utils/git/get-changed-files "${gitdir}" "${rev}") +cd "${repodir}" +files=$("${libexec}"/utils/git/get-changed-files "${repodir}" "${rev}") for file in ${files}; do target="${installdir}/${file}" parent=$(dirname "${target}") diff --git a/libexec/portzap/utils/install/update-deleted-files b/libexec/portzap/utils/install/update-deleted-files index bb9af91..b5e60a9 100755 --- a/libexec/portzap/utils/install/update-deleted-files +++ b/libexec/portzap/utils/install/update-deleted-files @@ -5,14 +5,14 @@ set -e # variables localbase=${LOCALBASE:-$(realpath "$(dirname "$0")"/../../../..)} libexec="${localbase}"/libexec/portzap -gitdir=$1 +repodir=$1 installdir=$2 rev=$3 ## # main -cd "${gitdir}" -files=$("${libexec}"/utils/git/get-removed-files "${gitdir}" "${rev}") +cd "${repodir}" +files=$("${libexec}"/utils/git/get-removed-files "${repodir}" "${rev}") for file in ${files}; do target="${installdir}"/"${file}" parent=$(dirname "${target}")