diff options
author | bill-auger <mr.j.spam.me@gmail.com> | 2020-10-26 00:06:34 -0400 |
---|---|---|
committer | bill-auger <mr.j.spam.me@gmail.com> | 2020-10-26 01:59:50 -0400 |
commit | f2bef0d4aa79bd89759d3dad0cf42fd415e334a0 (patch) | |
tree | 040c5223aff4df860ce14ff460f33ba57271086d | |
parent | ea14580bb86fec011581f29076609d9fcae18411 (diff) |
rename *aur*->*pur*
var/fn names were left in tact to minimize the diff with upstream;
but user-facing strings, the per-user dotfile names,
and the name of the script itself were changed
-rwxr-xr-x | pacaur | 126 |
1 files changed, 63 insertions, 63 deletions
@@ -2,14 +2,14 @@ # shellcheck source=/dev/null # -# pacaur: an AUR helper that minimizes user interaction +# pacpur: a PUR helper that minimizes user interaction # shopt -s extglob nullglob export LC_COLLATE='C' # gettext initialization -export TEXTDOMAIN='pacaur' TEXTDOMAINDIR='/usr/share/locale' +export TEXTDOMAIN='pacpur' TEXTDOMAINDIR='/usr/share/locale' declare -r version='4.8.6' @@ -45,11 +45,11 @@ load_makepkg_config check_buildenv check n || checkdeps=1 ## determine config location -XDG_CONFIG_DIRS="${XDG_CONFIG_DIRS:-/etc/xdg}" XDG_CONFIG_DIRS="${XDG_CONFIG_DIRS//://pacaur:}/pacaur:" +XDG_CONFIG_DIRS="${XDG_CONFIG_DIRS:-/etc/xdg}" XDG_CONFIG_DIRS="${XDG_CONFIG_DIRS//://pacpur:}/pacpur:" while read -rd: i; do [[ ! -d "${i}" ]] || { configdir="${i}"; break;} done <<<"${XDG_CONFIG_DIRS}" -declare -r tmpdir="${XDG_RUNTIME_DIR:-/tmp}" configdir="${configdir:-/etc/xdg/pacaur}" \ - userconfigdir="${XDG_CONFIG_HOME:-${HOME}/.config}/pacaur" \ - usercachedir="${XDG_CACHE_HOME:-${HOME}/.cache}/pacaur" +declare -r tmpdir="${XDG_RUNTIME_DIR:-/tmp}" configdir="${configdir:-/etc/xdg/pacpur}" \ + userconfigdir="${XDG_CONFIG_HOME:-${HOME}/.config}/pacpur" \ + usercachedir="${XDG_CACHE_HOME:-${HOME}/.cache}/pacpur" # set default config variables editor="${VISUAL:-${EDITOR:-vi}}" # build files editor @@ -61,7 +61,7 @@ sudoloop=1 # prevent sudo timeout # set variables declare -r pacman="${PACMAN:-pacman}" # pacman binary -declare -r clonedir="${AURDEST:-${usercachedir}}" # clone directory +declare -r clonedir="${PURDEST:-${usercachedir}}" # clone directory pacman_conf=('pacman-conf') # source xdg config @@ -83,10 +83,10 @@ ClassifyPkgs() { local i noaurpkgs=() # global aurpkgs repopkgs ((! repo)) || repopkgs=("${pkgs[@]}") aurpkgs=() - ((! aur)) || aurpkgs=("${pkgs[@]#aur/}") repopkgs=() # search aur/pkgs in AUR + ((! aur)) || aurpkgs=("${pkgs[@]#aur/}") repopkgs=() # search aur/pkgs in PUR if ((! repo && ! aur)); then for i in "${pkgs[@]}"; do - [[ "${i::4}" = 'aur/' ]] && aurpkgs+=("${i:4}") || noaurpkgs+=("${i}") # search aur/pkgs in AUR + [[ "${i::4}" = 'aur/' ]] && aurpkgs+=("${i:4}") || noaurpkgs+=("${i}") # search aur/pkgs in PUR done if [[ "${noaurpkgs[*]}" ]]; then while read -r i; do @@ -119,8 +119,8 @@ Core() { UpgradeAur() { local foreignpkgs allaurpkgs i # global aurpkgs - info $"%sStarting AUR upgrade...%s" "${colorW}" "${reset}" - mapfile -t aurpkgs < <(auracle sync -q) # use auracle to find out of date AUR packages + info $"%sStarting PUR upgrade...%s" "${colorW}" "${reset}" + mapfile -t aurpkgs < <(auracle sync -q) # use auracle to find out of date PUR packages mapfile -t foreignpkgs < <("${pacman}" -Qmq) SetInfo "${foreignpkgs[@]}" @@ -128,7 +128,7 @@ UpgradeAur() { # foreign packages check while read -r i; do - warn $"%s is %snot present%s in AUR -- skipping" "${colorW}${i}${reset}" "${colorY}" "${reset}" + warn $"%s is %snot present%s in PUR -- skipping" "${colorW}${i}${reset}" "${colorY}" "${reset}" done < <(CommArr -13 allaurpkgs foreignpkgs) # add devel packages @@ -151,7 +151,7 @@ IgnoreChecks() { # global aurpkgs rmaurpkgs [[ "${ignoredpkgs[*]:-}${ignoredgrps[*]:-}" ]] || return - # remove AUR pkgs versioning + # remove PUR pkgs versioning aurpkgsnover=("${aurpkgs[@]%%[><=]*}") # check targets @@ -208,7 +208,7 @@ DepsSolver() { # global errdepsnover foreignpkgs depsAname depsAver depsAood depsQver printf '%s\n' $"resolving dependencies..." - # remove AUR pkgs versioning + # remove PUR pkgs versioning aurpkgsnover=("${aurpkgs[@]%%[><=]*}") # set unversioned info @@ -248,7 +248,7 @@ DepsSolver() { mapfile -t deps < <(tsort <<< "${tsortdeps[@]}" 2>/dev/null) wait "$!" || error $"dependency cycle detected" "${E_INSTALL_DEPS_FAILED}" - # get AUR packages info + # get PUR packages info mapfile -t depsAname < <(GetInfo Name) mapfile -t depsAver < <(GetInfo Version) mapfile -t depsAood < <(GetInfo OutOfDate) @@ -315,12 +315,12 @@ FindDepsAur() { aurversionpkgsaurver="$(GetInfo Version "${aurversionpkgsname}")" aurversionpkgsverdiff="$(RunVercmp "${aurversionpkgsaurver}" "${aurversionpkgsver}")" - # not found in AUR nor repo + # not found in PUR nor repo [[ "${aurversionpkgsaurver}" || " ${errdeps[*]} " = *" ${aurversionpkgs[i]} "* ]] || { errdeps+=("${aurversionpkgs[i]}"); continue;} case "${aurversionpkgs[i]}" in - *">"*|*"<"*|*"="*) # found in AUR but version not correct + *">"*|*"<"*|*"="*) # found in PUR but version not correct case "${aurversionpkgs[i]}" in *">="*) ((aurversionpkgsverdiff < 0)) || continue;; *"<="*) ((aurversionpkgsverdiff > 0)) || continue;; @@ -383,7 +383,7 @@ FindDepsAur() { mapfile -t depspkgs < <("${pacman}" -T "${depspkgs[@]}") fi - # split repo and AUR depends pkgs + # split repo and PUR depends pkgs unset -v depspkgsaur if [[ "${depspkgs[*]}" ]]; then # remove all pkgs versioning @@ -419,7 +419,7 @@ FindDepsAur() { error $"dependency cycle detected (%s)" "${depspkgsaur[*]}" "${E_INSTALL_DEPS_FAILED}" if [[ "${depspkgsaur[*]}" ]]; then - ((dcount)) || prevdepspkgsaur=("${depspkgsaur[@]}") # store for AUR version check + ((dcount)) || prevdepspkgsaur=("${depspkgsaur[@]}") # store for PUR version check depspkgsaur=("${depspkgsaur[@]%%[><=]*}") # remove versioning fi @@ -441,11 +441,11 @@ SortDepsAur() { # remove versioning errdepsnover=("${errdeps[@]%%[><=]*}") - # check AUR deps only + # check PUR deps only for j in "${!sortdepspkgs[@]}"; do sortdepspkgs[j]="${sortdepspkgs[j]%%[><=]*}" MapfileAdd sortdepspkgsaur < <(GetInfo Name "${sortdepspkgs[j]}") - # add erroneous AUR deps + # add erroneous PUR deps [[ " ${errdepsnover[*]} " != *" ${sortdepspkgs[j]} "* ]] || sortdepspkgsaur+=("${sortdepspkgs[j]}") done @@ -733,11 +733,11 @@ ConflictChecks() { # shellcheck disable=SC2034 mapfile -t allQconflicts < <(expac -Ql'\n' '%C') - # AUR conflicts + # PUR conflicts Aprovides=("${depsAname[@]}") MapfileAdd Aprovides < <(GetInfo Provides) mapfile -t Aconflicts < <(GetInfo Conflicts) - # remove AUR versioning + # remove PUR versioning Aprovides=("${Aprovides[@]%%[><=]*}") Aconflicts=("${Aconflicts[@]%%[><=]*}") mapfile -t aurconflicts < <(CommArr -12 Aprovides allQconflicts; CommArr -12 Aconflicts allQprovides) SortArrAssign aurconflicts @@ -765,7 +765,7 @@ ConflictChecks() { [[ " ${depsAname[l]} " != *"${k}"* ]] || read -r depsQver[l] < <(expac -Qs '%v' "^${k}$") done MapfileAdd Aprovides < <(GetInfo Provides "${j}") - Aprovides=("${Aprovides[@]%%[><=]*}") # remove AUR versioning + Aprovides=("${Aprovides[@]%%[><=]*}") # remove PUR versioning [[ " ${Aprovides[*]} ${aurconflictingpkgsrm[*]} " = *" ${k} "* ]] || CheckRequires "${k}" break else @@ -781,7 +781,7 @@ ConflictChecks() { fi fi MapfileAdd Aprovides < <(GetInfo Provides "${j}") - Aprovides=("${Aprovides[@]%%[><=]*}") # remove AUR versioning + Aprovides=("${Aprovides[@]%%[><=]*}") # remove PUR versioning [[ " ${Aprovides[*]} ${aurconflictingpkgsrm[*]} " = *" ${k} "* ]] || CheckRequires "${k}" done done @@ -885,7 +885,7 @@ OrphanChecks() { local i # global depsAname depsAver depsAmain for i in "${!depsAname[@]}"; do - [[ "${depsAmain[i]}" != '%' ]] || warn $"%s-%s is %sorphaned%s in AUR" \ + [[ "${depsAmain[i]}" != '%' ]] || warn $"%s-%s is %sorphaned%s in PUR" \ "${colorW}${depsAname[i]}" "${depsAver[i]}${reset}" "${colorR}" "${reset}" done } @@ -920,7 +920,7 @@ Prompt() { done if [[ "$("${pacman_conf[@]}" VerbosePkgLists)" ]]; then - straurname=$"AUR Packages ""(${#deps[@]})" strreponame=$"Repo Packages ""(${#repodepspkgs[@]})" + straurname=$"PUR Packages ""(${#deps[@]})" strreponame=$"Repo Packages ""(${#repodepspkgs[@]})" stroldver=$"Old Version" strnewver=$"New Version" strsize=$"Download Size" depsArepo=("${depsAname[@]/#/aur/}") lname="$(GetLength "${depsArepo[@]}" "${repodepsSrepo[@]}" "${straurname}" "${strreponame}")" @@ -957,7 +957,7 @@ Prompt() { for i in "${!repodepspkgs[@]}"; do repodepspkgsver+="${repodepspkgs[i]}-${repodepsSver[i]} " done - printf "\n${colorW}%-16s${reset} %s\n" $"AUR Packages ""(${#deps[@]})" "${depsver}" + printf "\n${colorW}%-16s${reset} %s\n" $"PUR Packages ""(${#deps[@]})" "${depsver}" [[ ! "${repodepspkgs[*]}" ]] || printf "${colorW}%-16s${reset} %s\n" $"Repo Packages ""(${#repodepspkgs[@]})" "${repodepspkgsver}" fi @@ -1157,7 +1157,7 @@ MakePkgs() { errmakepkgs=("${errmakepkgs[@]/#/${colorW}}") fail $"failed to verify integrity or prepare %s package" "${errmakepkgs[@]/%/${reset}}" # remove sudo lock - rm -f "${tmpdir}/pacaur.sudov.lck" + rm -f "${tmpdir}/pacpur.sudov.lck" exit "${E_FAIL}" fi @@ -1165,8 +1165,8 @@ MakePkgs() { [[ ! -e "/var/lib/pacman/db.lck" ]] || error $"db.lck exists in /var/lib/pacman" "${E_FAIL}" # set build lock - [[ ! -e "${tmpdir}/pacaur.build.lck" ]] || error $"pacaur.build.lck exists in %s" "${tmpdir}" "${E_FAIL}" - :>"${tmpdir}/pacaur.build.lck" + [[ ! -e "${tmpdir}/pacpur.build.lck" ]] || error $"pacpur.build.lck exists in %s" "${tmpdir}" "${E_FAIL}" + :>"${tmpdir}/pacpur.build.lck" # install provider packages and repo conflicting packages that makepkg --noconfirm cannot handle if [[ "${repoprovidersconflictingpkgs[*]}" ]]; then @@ -1267,17 +1267,17 @@ MakePkgs() { fi done - # remove AUR deps + # remove PUR deps if ((! installpkg)); then [[ ! "${aurdepspkgs[*]}" ]] || mapfile -t aurdepspkgs < <(expac -Q '%n' "${aurdepspkgs[@]}") - [[ ! "${aurdepspkgs[*]}" ]] || { info $"Removing installed AUR dependencies..." + [[ ! "${aurdepspkgs[*]}" ]] || { info $"Removing installed PUR dependencies..." sudo "${pacman}" -Rsn "${aurdepspkgs[@]}" --noconfirm;} # re-add removed conflicting packages [[ ! "${aurconflictingpkgsrm[*]}${repoconflictingpkgsrm[*]}" ]] || sudo "${pacman}" -S \ "${aurconflictingpkgsrm[@]}" "${repoconflictingpkgsrm[@]}" --ask 36 --asdeps --needed --noconfirm fi - rm -f "${tmpdir}/pacaur."{'build','sudov'}'.lck' # remove locks + rm -f "${tmpdir}/pacpur."{'build','sudov'}'.lck' # remove locks # new orphan and optional packages check # shellcheck disable=SC2034 @@ -1306,9 +1306,9 @@ CleanCache() { [[ ! "${cachedir[*]}" ]] || cachedir=("${cachedir[@]%/}") PKGDEST="${PKGDEST%/}" if [[ "${PKGDEST}" && " ${cachedir[*]} " != *" ${PKGDEST} "* ]]; then ((ccount != 1)) || printf '\n%s\n %s\n' $"Packages to keep:" $"All locally installed packages" - printf '\n%s %s\n' $"AUR cache directory:" "${PKGDEST}" + printf '\n%s %s\n' $"PUR cache directory:" "${PKGDEST}" if ((ccount == 1)); then - if Proceed y $"Do you want to remove all other packages from AUR cache?"; then + if Proceed y $"Do you want to remove all other packages from PUR cache?"; then printf '%s\n' $"removing old packages from cache..." cachepkgs=("${PKGDEST}/"*) cachepkgs=("${cachepkgs[@]##*/}") for i in "${cachepkgs[@]%-*}"; do @@ -1316,21 +1316,21 @@ CleanCache() { done fi else - Proceed n $"Do you want to remove ALL files from AUR cache?" || - { printf '%s\n' $"removing all files from AUR cache..." + Proceed n $"Do you want to remove ALL files from PUR cache?" || + { printf '%s\n' $"removing all files from PUR cache..." rm "${PKGDEST}/"* &>/dev/null;} fi fi if [[ -d "${SRCDEST}" ]]; then ((ccount != 1)) || printf '\n%s\n %s\n' $"Sources to keep:" $"All development packages sources" - printf '\n%s %s\n' $"AUR source cache directory:" "${SRCDEST}" + printf '\n%s %s\n' $"PUR source cache directory:" "${SRCDEST}" if ((ccount == 1)) && - Proceed y $"Do you want to remove all non development files from AUR source cache?"; then + Proceed y $"Do you want to remove all non development files from PUR source cache?"; then printf '%s\n' $"removing non development files from source cache..." rm -f "${SRCDEST}/"* &>/dev/null - elif ! Proceed n $"Do you want to remove ALL files from AUR source cache?"; then - printf '%s\n' $"removing all files from AUR source cache..." + elif ! Proceed n $"Do you want to remove ALL files from PUR source cache?"; then + printf '%s\n' $"removing all files from PUR source cache..." rm -rf "${SRCDEST:?}/"* fi fi @@ -1342,7 +1342,7 @@ CleanCache() { printf '\n%s\n %s\n' $"Clones to keep:" $"All other locally installed clones" fi fi - printf '\n%s %s\n' $"AUR clone directory:" "${clonedir}" + printf '\n%s %s\n' $"PUR clone directory:" "${clonedir}" if ((ccount == 1)); then mapfile -t foreignpkgs < <("${pacman}" -Qmq) mapfile -t foreignpkgsbase < <(expac -Q '%e' "${foreignpkgs[@]}") @@ -1350,24 +1350,24 @@ CleanCache() { if [[ "${pkgs[*]}" ]]; then mapfile -t pkgsbase < <(expac -Q '%e' "${pkgs[@]}") mapfile -t aurpkgsbase < <(CommArr -13 pkgsbase foreignpkgsbase) - if Proceed y $"Do you want to remove %s clones from AUR clone directory?" \ + if Proceed y $"Do you want to remove %s clones from PUR clone directory?" \ "${aurpkgsbase[*]}"; then - printf '%s\n\n' $"removing uninstalled clones from AUR clone cache..." + printf '%s\n\n' $"removing uninstalled clones from PUR clone cache..." for i in "${aurpkgsbase[@]}"; do [[ ! -d "${clonedir}/${i}" ]] || rm -rf "${clonedir:?}/${i}" done fi else - if Proceed y $"Do you want to remove all uninstalled clones from AUR clone directory?"; then - printf '%s\n\n' $"removing uninstalled clones from AUR clone cache..." + if Proceed y $"Do you want to remove all uninstalled clones from PUR clone directory?"; then + printf '%s\n\n' $"removing uninstalled clones from PUR clone cache..." for i in "${clonedir}/"*; do [[ ! -d "${i}" || " ${foreignpkgsbase[*]} " = *" ${i} "* ]] || rm -rf "${clonedir:?}/${i}" done fi if [[ ! "${PKGDEST}" || ! "${SRCDEST}" ]]; then - if Proceed y $"Do you want to remove all untracked files from AUR clone directory?"; then - printf '%s\n' $"removing untracked files from AUR clone cache..." + if Proceed y $"Do you want to remove all untracked files from PUR clone directory?"; then + printf '%s\n' $"removing untracked files from PUR clone cache..." for i in "${clonedir}/"*; do [[ ! -d "${i}" ]] || git --git-dir="${i}/.git" --work-tree="${i}" clean -ffdx &>/dev/null @@ -1376,8 +1376,8 @@ CleanCache() { fi fi else - if ! Proceed n $"Do you want to remove ALL clones from AUR clone directory?"; then - printf '%s\n' $"removing all clones from AUR clone cache..." + if ! Proceed n $"Do you want to remove ALL clones from PUR clone directory?"; then + printf '%s\n' $"removing all clones from PUR clone cache..." for i in "${clonedir}/"*; do [[ ! -d "${i}" ]] || rm -rf "${i}"; done fi fi @@ -1568,9 +1568,9 @@ NothingToDo() { SudoV() { local sleep - :>"${tmpdir}/pacaur.sudov.lck" + :>"${tmpdir}/pacpur.sudov.lck" exec {sleep}<> <(:) - while [[ -e "${tmpdir}/pacaur.sudov.lck" ]]; do + while [[ -e "${tmpdir}/pacpur.sudov.lck" ]]; do sudo "${pacman}" -V >/dev/null read -rt 298 -u "${sleep}" || : done @@ -1616,29 +1616,29 @@ MakePkg() { Cancel() { printf '\n' - rm -f "${tmpdir}"/pacaur.{build,sudov}.lck + rm -f "${tmpdir}"/pacpur.{build,sudov}.lck exit 130 } Usage() { printf '%s\n' \ - $"usage: pacaur <operation> [options] [target(s)] -- See also pacaur(8)" \ + $"usage: pacpur <operation> [options] [target(s)] -- See also pacpur(8)" \ $"operations:" \ $" pacman extension" \ $" -S, -Ss, -Si, -Sw, -Su, -Qu, -Sc, -Scc" \ - $" extend pacman operations to the AUR" \ + $" extend pacman operations to the PUR" \ $" general" \ $" -v, --version display version information" \ $" -h, --help display help information" \ '' \ $"options:" \ $" pacman extension - can be used with the -S, -Ss, -Si, -Sw, -Su, -Sc, -Scc operations" \ - $" -a, --aur only search, build, install or clean target(s) from the AUR" \ + $" -a, --aur only search, build, install or clean target(s) from the PUR" \ $" -r, --repo only search, build, install or clean target(s) from the repositories" \ $" general" \ $" -e, --edit edit target(s) PKGBUILD and view install script" \ $" -q, --quiet show less information for query and search" \ - $" --devel consider AUR development packages upgrade" \ + $" --devel consider PUR development packages upgrade" \ $" --foreign consider already installed foreign dependencies" \ $" --ignore ignore a package upgrade (can be used more than once)" \ $" --needed do not reinstall already up-to-date target(s)" \ @@ -1723,7 +1723,7 @@ for ((;;)) { # help or version { [[ "${operation}" != 'version' ]] && ((pac || ! ver));} || - { printf 'pacaur %s\n' "${version}"; exit "${E_OK}";} + { printf 'pacpur %s\n' "${version}"; exit "${E_OK}";} ((pac || ! help)) || Usage # sorting @@ -1769,7 +1769,7 @@ command -v "${editor%% *}" >/dev/null || error $"%s\$VISUAL%s and %s\$EDITOR%s environment variables not set or defined %seditor%s not found" \ "${colorW}" "${reset}" "${colorW}" "${reset}" "${colorW}" "${reset}" "${E_MISSING_FILE}" [[ "${PACMAN-}" != "${0##*/}" ]] || - error $"you cannot use %spacaur%s as PACMAN environment variable" "${colorW}" "${reset}" "${E_FAIL}" + error $"you cannot use %spacpur%s as PACMAN environment variable" "${colorW}" "${reset}" "${E_FAIL}" [[ -w "${clonedir}" ]] || error $"%s does not have write permission" "${colorW}${clonedir}${reset}" "${E_FS_PERMISSIONS}" [[ "${pkgs[*]}" || ("${operation}" != @(sync|edit) && " ${pacmanarg[*]} " != *' -'[RU]' '*) ]] || @@ -1819,7 +1819,7 @@ case "${operation}" in if ((refresh)) && [[ ! "${repopkgs[*]}" ]]; then sudo "${pacman}" -Sy "${pacopts[@]}" fi - ((aur)) || info $"Package(s) %s not found in repositories, trying %sAUR%s..." \ + ((aur)) || info $"Package(s) %s not found in repositories, trying %sPUR%s..." \ "${colorW}${aurpkgs[*]}${reset}" "${colorM}" "${reset}" auracle info "${auropts[@]}" -- "${aurpkgs[@]}" fi @@ -1836,7 +1836,7 @@ case "${operation}" in fi fi if [[ "${aurpkgs[*]}" ]] && ((! aur)); then - info $"Package(s) %s not found in repositories, trying %sAUR%s..." \ + info $"Package(s) %s not found in repositories, trying %sPUR%s..." \ "${colorW}${aurpkgs[*]}${reset}" "${colorM}" "${reset}" fi ((repo)) || Core @@ -1854,7 +1854,7 @@ case "${operation}" in if ((refresh)) && [[ ! "${repopkgs[*]}" ]]; then sudo "${pacman}" -Sy "${pacopts[@]}" fi - ((aur)) || info $"Package(s) %s not found in repositories, trying %sAUR%s..." \ + ((aur)) || info $"Package(s) %s not found in repositories, trying %sPUR%s..." \ "${colorW}${aurpkgs[*]}${reset}" "${colorM}" "${reset}" Core fi |