1 files changed, 37 insertions, 24 deletions

diff --git a/src/cpt-lib.in b/src/cpt-lib.in
index e2581a0..a881d0e 100644
--- a/src/cpt-lib.in
+++ b/src/cpt-lib.in
@@ -511,6 +511,9 @@ as_root() {
 
     # We are exporting package manager variables, so that we still have the
     # same repository paths / access to the same cache directories etc.
+    #
+    # It doesn't matter whether CPT_HOOK is defined or not.
+    # shellcheck disable=2153
     set -- HOME="$HOME" \
            USER="$user" \
            XDG_CACHE_HOME="$XDG_CACHE_HOME" \
@@ -552,23 +555,26 @@ pop() {
 }
 
 run_hook() {
-    # Store the CPT_HOOK variable so that we can revert it if it is changed.
-    oldCPT_HOOK=$CPT_HOOK
-
-    # If a fourth parameter 'root' is specified, source the hook from a
-    # predefined location to avoid privilige escalation through user scripts.
-    [ "$4" ] && CPT_HOOK=$CPT_ROOT/etc/cpt-hook
-
-    [ -f "$CPT_HOOK" ] || { CPT_HOOK=$oldCPT_HOOK; return 0 ;}
-
-    if [ "$2" ]; then
-        logv "$2" "Running $1 hook"
-    else
-        logv "Running $1 hook"
-    fi
+    # Check that hooks exist before announcing that we are running a hook.
+    set +f
+    for hook in "$cpt_confdir/hooks/"* "$CPT_HOOK"; do
+        [ -f "$hook" ] && {
+            if [ "$2" ]; then
+                logv "$2" "Running $1 hook"
+            else
+                logv "Running $1 hook"
+            fi
+            break
+        }
+    done
 
-    TYPE=${1:-null} PKG=${2:-null} DEST=${3:-null} . "$CPT_HOOK"
-    CPT_HOOK=$oldCPT_HOOK
+    # Run all the hooks found in the configuration directory, and the user
+    # defined hook.
+    for hook in "$cpt_confdir/hooks/"* "$CPT_HOOK"; do
+        set -f
+        [ -f "$hook" ] || continue
+        TYPE=${1:-null} PKG=${2:-null} DEST=${3:-null} . "$hook"
+    done
 }
 
 # An optional argument could be provided to enforce a compression algorithm.
@@ -1559,7 +1565,7 @@ pkg_remove() {
     # shellcheck disable=2086
     [ "$manifest_list" ] && grep -h '/$' $manifest_list | sort -ur > "$dirs"
 
-    run_hook pre-remove "$1" "$sys_db/$1" root
+    run_hook pre-remove "$1" "$sys_db/$1"
 
     while read -r file; do
         # The file is in '/etc' skip it. This prevents the package
@@ -1578,7 +1584,7 @@ pkg_remove() {
     # we no longer need to block 'Ctrl+C'.
     trap_set cleanup
 
-    run_hook post-remove "$1" "$CPT_ROOT/" root
+    run_hook post-remove "$1" "$CPT_ROOT/"
 
     log "$1" "Removed successfully"
 }
@@ -1641,7 +1647,7 @@ pkg_install() {
 
     [ "$install_dep" ] && die "$1" "Package requires ${install_dep%, }"
 
-    run_hook pre-install "$pkg_name" "$tar_dir/$pkg_name" root
+    run_hook pre-install "$pkg_name" "$tar_dir/$pkg_name"
     pkg_conflicts "$pkg_name"
 
     log "$pkg_name" "Installing package incrementally"
@@ -1706,7 +1712,7 @@ pkg_install() {
         "$sys_db/$pkg_name/post-install" ||:
     fi
 
-    run_hook post-install "$pkg_name" "$sys_db/$pkg_name" root
+    run_hook post-install "$pkg_name" "$sys_db/$pkg_name"
 
     log "$pkg_name" "Installed successfully"
 }
@@ -2024,12 +2030,12 @@ pkg_updates(){
 }
 
 pkg_get_base() (
-    # Print the packages defined in the /etc/cpt-base file.
+    # Print the packages defined in the CPT base file.
     # If an argument is given, it prints a space seperated list instead
     # of a list seperated by newlines.
 
-    # cpt-base is an optional file, return with success if it doesn't exist.
-    [ -f "$CPT_ROOT/etc/cpt-base" ] || return 0
+    # CPT base is an optional file, return with success if it doesn't exist.
+    [ -f "$cpt_base" ] || return 0
 
     # If there is an argument, change the format to use spaces instead of
     # newlines.
@@ -2053,7 +2059,7 @@ pkg_get_base() (
         for dep in $deps; do
             contains "$*" "$dep" || set -- "$@" "$dep"
         done
-    done < "$CPT_ROOT/etc/cpt-base"
+    done < "$cpt_base"
 
     # Format variable is intentional.
     # shellcheck disable=2059
@@ -2277,6 +2283,13 @@ create_cache() {
     # the get go. It will be created as needed by package installation.
     sys_db=$CPT_ROOT/$pkg_db
 
+    # CPT system configuration directory
+    cpt_confdir=$CPT_ROOT@SYSCONFDIR@/cpt
+
+    # Backwards compatibility for the old cpt-base location
+    cpt_base=$CPT_ROOT/etc/cpt-base
+    [ -f "$cpt_confdir/base" ] && cpt_base=$cpt_confdir/base
+
     # Regular expression used in pkg_checksums() and pkg_sources() in order to
     # identify VCS and comments
     re_vcs_or_com='^(#|(fossil|git|hg)\+)'