OSDN Git Service

[clean] : Separation of processing by function
[alterlinux/aptpac.git] / aptpac
diff --git a/aptpac b/aptpac
index 3bce1e3..d7e0927 100755 (executable)
--- a/aptpac
+++ b/aptpac
 # If it is empty, the corresponding AUR helper will be searched automatically.
 #AURHELPER=
 
-
 set -e
-APTPAC_VERSION="3.2.1"
-PACMAN_OPTIONS=
+
+
+APTPAC_VERSION="3.3.0"
+PACMAN_OPTIONS=()
 HELPERS=(
     "/usr/bin/yay"
     "/usr/bin/paru"
@@ -35,9 +36,10 @@ HELPERS=(
 DEFAULT_PACMAN_COMMAND="/usr/bin/pacman"
 PACMAN_COMMAND="${DEFAULT_PACMAN_COMMAND}"
 PACMAN_CONFIG="/etc/pacman.conf"
+DEBUG=false
+RUN_WITH_SUDO=false
 
-direct_option=false
-debug=false
+DIRECT_PACMAN=false
 autoremove=false
 
 _msg_error () {
@@ -45,37 +47,11 @@ _msg_error () {
 }
 
 _msg_debug () {
-    if ${debug}; then
+    if "${DEBUG}"; then
         echo -e "${@}" >&1
     fi
 }
 
-if [[ ! "${UID}" = 0 ]]; then
-    if [[ -z "${AURHELPER+SET}" ]]; then
-        for AURHELPER in ${HELPERS[@]}; do
-            if [[ -f "${AURHELPER}" ]]; then
-                PACMAN_COMMAND="${AURHELPER}"
-                break
-            elif hash "$(basename "${AURHELPER}")" 2> /dev/null; then
-                PACMAN_COMMAND="$(basename "${AURHELPER}")"
-                break
-            fi
-        done
-        if [[ "${PACMAN_COMMAND}" == "${DEFAULT_PACMAN_COMMAND}" ]]; then
-            PACMAN_COMMAND="sudo ${DEFAULT_PACMAN_COMMAND}"
-        fi
-    else
-        if [[ -f "${AURHELPER}" ]]; then
-            PACMAN_COMMAND="${AURHELPER}"
-        elif hash "$(basename "${AURHELPER}")" 2> /dev/null; then
-            PACMAN_COMMAND="$(basename "${AURHELPER}")"
-        else
-            _msg_error "${AURHELPER} is not installed"
-            exit 1
-        fi
-    fi
-fi
-
 
 # List option
 installed=false
@@ -93,15 +69,16 @@ _usage () {
     echo "    search                               Search for a package"
     echo "    autoremove                           Remove unnecessary packages"
     echo "    clean                                Remove the package cache"
-    echo "    list                                 Displays a list of packages"
-    echo "    show                                 Displays the package records"
+    echo "    list                                 Display a list of packages"
+    echo "    show | showpkg                       Display the package records"
+    echo "    rdepends                             Display the dependencies"
     echo
     echo " apt options:"
     echo "    -y | --yes  | --assume-yes           Do not check"
     echo "    -d | --download-only                 Only download the package"
     echo "    -c | --config-file <file>            Config file for pacman"
     echo "    -h | --help                          Display this help"
-    echo "    -v | --version                       Displays the version of aptpac and pacman"
+    echo "    -v | --version                       Display the version of aptpac and pacman"
     echo "         --auto-remove | --autoremove    Remove unnecessary packages with other command"
     echo "         --purge                         Delete the entire configuration file"
     echo
@@ -110,11 +87,13 @@ _usage () {
     echo "                                         Ignored if pacapt is run as root"
     echo "                                         Specify AUR helper that supports common command line options with pacman"
     echo
-    echo " aptpac supports not only above options but also options of pacman"
+    echo " Notes:"
+    echo "    - aptpac supports not only above options but also options of pacman"
+    echo "    - If you specify the deb file, you can install using debtap"
 }
 
 _exit () {
-    exit ${1}
+    exit "${1}"
 }
 
 _version () {
@@ -123,18 +102,74 @@ aptpac ${APTPAC_VERSION} - A pacman wrapper with syntax based on debian's apt
 License: Do What The Fuck You Want To Public License
 (c) 2019-2020 Fascode Network. Yamada Hayao
 EOF
-echo
-pacman --version
+    echo
+    pacman --version
 }
 
-
 ADD_OPTION () {
-    PACMAN_OPTIONS="${PACMAN_OPTIONS} ${@}"
+    PACMAN_OPTIONS+=("${@}")
 }
 
+_sudo(){
+    if "${RUN_WITH_SUDO}"; then
+        eval sudo "${@}"
+    else
+        eval "${@}"
+    fi
+}
+
+_run_detect_aur_helper(){
+    if [[ ! "${UID}" = 0 ]]; then
+        if [[ -z "${AURHELPER+SET}" ]]; then
+            for AURHELPER in "${HELPERS[@]}"; do
+                if [[ -f "${AURHELPER}" ]]; then
+                    PACMAN_COMMAND="${AURHELPER}"
+                    break
+                elif hash "$(basename "${AURHELPER}")" 2> /dev/null; then
+                    PACMAN_COMMAND="$(basename "${AURHELPER}")"
+                    break
+                fi
+            done
+        else
+            if [[ -f "${AURHELPER}" ]]; then
+                PACMAN_COMMAND="${AURHELPER}"
+            elif hash "$(basename "${AURHELPER}")" 2> /dev/null; then
+                PACMAN_COMMAND="$(basename "${AURHELPER}")"
+            else
+                _msg_error "${AURHELPER} is not installed"
+                exit 1
+            fi
+        fi
+    fi
+}
+
+_run_aur_message(){
+    if [[ ! "${PACMAN_COMMAND}" = "${DEFAULT_PACMAN_COMMAND}" ]] && [[ ! "$(basename "${PACMAN_COMMAND}")" = "$(basename "${DEFAULT_PACMAN_COMMAND}")" ]]; then
+        _msg_debug "Use AUR helper ${PACMAN_COMMAND}"
+    else
+        RUN_WITH_SUDO=true
+    fi
+}
+
+_run_autoremove(){
+    if "${autoremove}"; then
+        if [[ -n $(${PACMAN_COMMAND} -Qttdq) ]]; then
+            "${PACMAN_COMMAND}" -Qttdq | _sudo "${PACMAN_COMMAND}" -Rsc --config "${PACMAN_CONFIG}" -
+        else
+            echo "No packages to remove"
+            exit 0
+        fi
+    fi
+}
+
+_run_pacman(){
+    _sudo "${PACMAN_COMMAND}" "${PACMAN_OPTIONS[@]}" --config "${PACMAN_CONFIG}" "${PACKAGE[@]}"
+}
+
+
 # Argument analysis and processing
 set +e
-PACAPT_ARGUMENTS="${@}"
+PACAPT_ARGUMENTS=("${@}")
 _opt_short="ydfc:hvVDFQRSTU"
 _opt_long="yes,assume-yes,download-only,fix-broken,purse,installed,debug,help,version,config-file:,auto-remove,autoremove,aur-helper:"
 OPT=$(getopt -o ${_opt_short} -l ${_opt_long} -- "${@}" 2> /dev/null)
@@ -148,7 +183,7 @@ eval set -- "${OPT}"
 unset OPT _opt_short _opt_long
 
 while true; do
-    case ${1} in
+    case "${1}" in
         -y | --yes | --assume-yes)
             ADD_OPTION "--noconfirm"
             shift 1
@@ -173,7 +208,7 @@ while true; do
             shift 1
             ;;
         --debug)
-            debug=true
+            DEBUG=true
             shift 1
             ;;
         -h | --help)
@@ -204,8 +239,8 @@ while true; do
             shift 2
             ;;
         -V | -D | -F | -Q | -R | -S | -T | -U)
-            direct_option=true
-            ADD_OPTION "${PACAPT_ARGUMENTS}"
+            DIRECT_PACMAN=true
+            ADD_OPTION "${PACAPT_ARGUMENTS[@]}"
             break
             ;;
         --)
@@ -220,7 +255,7 @@ while true; do
     esac
 done
 
-if [[ "${direct_option}" = false ]]; then
+if [[ "${DIRECT_PACMAN}" = false ]]; then
     if [[ $# -lt 1 ]]; then
         _msg_error "No command specified"
         _usage
@@ -254,17 +289,20 @@ if [[ "${direct_option}" = false ]]; then
         full-upgrade)
             ADD_OPTION "-Syu"
             ;;
+        clean)
+            ADD_OPTION "-Sccc"
+            ;;
+        dist-upgrade)
+            ADD_OPTION "-Syu"
+            ;;
         edit-sources)
             if [[ -n "${EDITOR}" ]]; then
-                sudo ${EDITOR} "${PACMAN_CONFIG}"
+                sudo "${EDITOR}" "${PACMAN_CONFIG}"
             else
                 sudo nano "${PACMAN_CONFIG}"
             fi
             _exit 0
             ;;
-        dist-upgrade)
-            ADD_OPTION "-Syu"
-            ;;
         huawei) 
             if [[ "$(source "/etc/locale.conf" 2> /dev/null; echo -n "${LANG}")" = "ja_JP.UTF-8" ]]; then
                 echo "(ง •ᴗ•)ว ⁾⁾ファーウェイでウェイウェイ"
@@ -281,16 +319,15 @@ if [[ "${direct_option}" = false ]]; then
             echo "  / |    ||   "
             echo " *  /\---/\ "
             echo "    ~~   ~~   "
-            echo "...."Have you mooed today?"..."
+            echo "....\"Have you mooed today?\"..."
             exit 0
             ;;
-        clean)
-            ADD_OPTION "-Sccc"
-            ;;
         autoremove) 
             if [[ -n "$(${PACMAN_COMMAND} -Qttdq)" ]]; then
                 ADD_OPTION "-Rsc"
-                PACKAGE=($(${PACMAN_COMMAND} -Qttdq))
+                while read -r pkg; do
+                    PACKAGE+=("${pkg}")
+                done < <(${PACMAN_COMMAND} -Qttdq)
             else
                 echo "No packages to remove"
                 exit 0
@@ -303,16 +340,23 @@ if [[ "${direct_option}" = false ]]; then
                 ADD_OPTION "-Ss"
             fi
             ;;
-        show)
-            if (( "${#PACKAGE[@]}" != 1 )); then
-                _msg_error "Please specify only one package."
-                exit 1
-            fi
-            if pacman -Qq "${PACKAGE[0]}" 2> /dev/null 1>&2; then
-                ADD_OPTION "-Qi"
-            else
-                ADD_OPTION "-Si"
-            fi
+        show | showpkg)
+            for pkg in "${PACKAGE[@]}"; do
+                if pacman -Qq "${pkg}" 2> /dev/null 1>&2; then
+                    "${PACMAN_COMMAND}" "${PACMAN_OPTIONS[@]}" -Qi --config "${PACMAN_CONFIG}" "${pkg}"
+                else
+                    "${PACMAN_COMMAND}" "${PACMAN_OPTIONS[@]}" -Si --config "${PACMAN_CONFIG}" "${pkg}"
+                fi
+            done
+            unset pkg
+            _exit 0
+            ;;
+        rdepends)
+            ADD_OPTION "-Sii"
+            ;;
+        help)
+            _usage
+            exit 0
             ;;
         *)
             _msg_error "Invalid command '${COMMAND}'"
@@ -321,18 +365,8 @@ if [[ "${direct_option}" = false ]]; then
     esac
 fi
 
-if [[ ! "${PACMAN_COMMAND}" = "pacman" ]] && [[ ! "${PACMAN_COMMAND}" = "sudo pacman" ]]; then
-    _msg_debug "Use AUR helper ${PACMAN_COMMAND}"
-fi
 
-# echo "${PACMAN_COMMAND} ${PACMAN_OPTIONS} ${PACKAGE}"
-${PACMAN_COMMAND} ${PACMAN_OPTIONS} --config "${PACMAN_CONFIG}" "${PACKAGE[@]}"
-
-if ${autoremove}; then
-    if [[ -n $(${PACMAN_COMMAND} -Qttdq) ]]; then
-        ${PACMAN_COMMAND} -Rsc --config "${PACMAN_CONFIG}" $(${PACMAN_COMMAND} -Qttdq)
-    else
-        echo "No packages to remove"
-        exit 0
-    fi
-fi
+_run_detect_aur_helper
+_run_aur_message
+_run_pacman
+_run_autoremove