From 5cbd294d9fb1587926119e60a00dc3e66a3c1416 Mon Sep 17 00:00:00 2001 From: Silvio Rhatto Date: Sat, 7 Apr 2018 10:25:03 -0300 Subject: Adds hoarder for local installs --- trashman | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'trashman') diff --git a/trashman b/trashman index 34a1247..4758a21 100755 --- a/trashman +++ b/trashman @@ -1,6 +1,6 @@ #!/usr/bin/env sh # -# Provision: install stuff using scripts. +# trashman handles junky software # # Copyright (C) 2017 Silvio Rhatto - rhatto at riseup.net # @@ -27,14 +27,16 @@ CWD="`pwd`" # Set shared files location if [ -e "`dirname $(readlink -f $0)`/share/$NAME" ]; then # Development or local installation layout - SHARE="`dirname $(readlink -f $0)`/share/$NAME" + LIB="`dirname $(readlink -f $0)`/share/$NAME" + SHARE="`dirname $(readlink -f $0)`/share/$BASENAME" else # System installation layout - SHARE="`dirname $(readlink -f $0)`/../share/$NAME" + LIB="`dirname $(readlink -f $0)`/../share/$NAME" + SHARE="`dirname $(readlink -f $0)`/../share/$BASENAME" fi # Include basic functions -. $SHARE/trashman/functions || exit 1 +. $LIB/trashman/functions || exit 1 # Display usage trashman_usage() { @@ -79,7 +81,11 @@ else folder="`trashman_actions_folder $package`" # Checking for privileges - trashman_check_root $ACTION + if [ "$BASENAME" == "trashman" ]; then + trashman_check_root $ACTION + else + trashman_check_sudo + fi if [ -x "$SHARE/$package/$folder/$ACTION" ]; then if [ "$ACTION" != "check" ] && [ "$ACTION" != "test" ]; then -- cgit v1.2.3