diff --git a/pkgadd b/pkgadd index c00479d..5ac32f7 100755 --- a/pkgadd +++ b/pkgadd @@ -59,7 +59,6 @@ Options: --no-preupgrade skip preupgrade script before upgrade package --no-postupgrade skip postupgrade script after upgrade package --no-backup skip backup when upgrading package - --no-hook skip trigger hook --root= install to custom root directory EOF @@ -93,7 +92,6 @@ parse_opts() { --no-postupgrade) NO_POSTUPGRADE=yes ;; --no-backup) NO_BACKUP=yes ;; --no-color) NOCOLOR=yes ;; - --no-hook) NOHOOK=yes ;; --root=*) ROOT="${1#*=}" ;; *.spkg.tar.*) PKGNAME="$1" ;; *) msg "Invalid option! ($1)"; exit 1 ;; diff --git a/pkgbuild b/pkgbuild index 6badfc9..98ebb0c 100755 --- a/pkgbuild +++ b/pkgbuild @@ -502,7 +502,6 @@ parse_opts() { --no-postinstall) OPTS+=($1) ;; --no-preupgrade) OPTS+=($1) ;; --no-postupgrade) OPTS+=($1) ;; - --no-hook) OPTS+=($1) ;; --no-backup) OPTS+=($1) ;; --redownload) REDOWNLOAD_SOURCE=yes ;; --srcdir=*) SOURCE_DIR="${1#*=}" ;; @@ -541,7 +540,6 @@ Options: --no-postinstall skip postinstall script after install package --no-preupgrade skip preupgrade script before upgrade package --no-postupgrade skip postupgrade script after upgrade package - --no-hook skip trigger hook --no-backup skip backup configuration file when upgrading package --redownload re-download source file diff --git a/pkgdel b/pkgdel index a39757d..8a37e53 100755 --- a/pkgdel +++ b/pkgdel @@ -52,7 +52,6 @@ Options: -h, --help show this help message --no-preremove don't run pre-remove script --no-postremove don't run post-remove script - --no-hook skip executing hook --root= remove package from custom root directory EOF @@ -79,7 +78,6 @@ parse_opts() { -v | --verbose) VERBOSE_REMOVE=yes ;; --no-preremove) NO_PREREMOVE=yes ;; --no-postremove) NO_POSTREMOVE=yes ;; - --no-hook) NOHOOK=yes ;; --root=*) ROOT="${1#*=}" ;; -*) msg "Invalid option: ($1)"; exit 1 ;; *) RMNAME=$1 ;; diff --git a/scratch b/scratch index a0d99db..6711fdf 100755 --- a/scratch +++ b/scratch @@ -769,7 +769,7 @@ scratch_install() { else pushd $(getportpath $ii) settermtitle "Reinstalling $ii..." - pkgbuild --no-hook ${OPTS[@]} + pkgbuild ${OPTS[@]} if [ $? != 0 ]; then error=1 break @@ -793,7 +793,7 @@ scratch_install() { else pushd $(getportpath $ii) settermtitle "Installing $ii..." - pkgbuild -i --no-hook ${OPTS[@]} + pkgbuild -i ${OPTS[@]} if [ $? != 0 ]; then error=1 break @@ -847,7 +847,7 @@ scratch_install() { if [ "$portpathh" ]; then pushd $portpathh settermtitle "[ $count/$total ] installing $int..." - pkgbuild -i --no-hook ${OPTS[@]} + pkgbuild -i ${OPTS[@]} if [ $? != 0 ]; then error=1 count=$(( $count - 1 )) @@ -938,7 +938,7 @@ scratch_remove() { count=$(( $count + 1 )) pre_triggers $pkg settermtitle "[ $count/$pkgcount ] Removing $pkg..." - pkgdel --no-hook $pkg ${OPTS[@]} || return 1 + pkgdel $pkg ${OPTS[@]} || return 1 done settermtitle "Triggering remove hook" post_triggers @@ -1023,7 +1023,7 @@ scratch_sysup() { pushd $(getportpath $inst) if ! isinstalled $inst; then settermtitle "[ $count/$total ] Installing $inst..." - pkgbuild -i --no-hook ${OPTS[@]} + pkgbuild -i ${OPTS[@]} if [ $? != 0 ]; then error=1 count=$(( $count - 1 )) @@ -1031,7 +1031,7 @@ scratch_sysup() { fi else settermtitle "[ $count/$total ] Upgrading $inst..." - pkgbuild -u --no-hook ${OPTS[@]} + pkgbuild -u ${OPTS[@]} if [ $? != 0 ]; then error=1 count=$(( $count - 1 )) @@ -1122,7 +1122,7 @@ scratch_upgrade() { count=$(( $count + 1 )) pushd $(getportpath $newpkg) settermtitle "[ $count/$total ] Installing $newpkg..." - pkgbuild -i --no-hook ${OPTS[@]} + pkgbuild -i ${OPTS[@]} if [ $? != 0 ]; then error=1 count=$(( $count - 1 )) @@ -1136,7 +1136,7 @@ scratch_upgrade() { count=$(( $count + 1 )) pushd $(getportpath $pkg) settermtitle "[ $count/$total ] Upgrading $pkg..." - pkgbuild -u --no-hook ${OPTS[@]} + pkgbuild -u ${OPTS[@]} if [ $? != 0 ]; then error=1 count=$(( $count - 1 ))