diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-06-21 22:58:42 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-06-22 09:00:34 +0200 |
| commit | ca85aab95397ae918088f8ba2195eb4eb996c739 (patch) | |
| tree | 53c83f5d50354f163eeab5dd11c8ba109be9e291 /source/a/pkgtools/scripts/pkgtool | |
| parent | b893b1174dfcd0fdc84aa597eee76b797d6d7b11 (diff) | |
| download | current-ca85aab95397ae918088f8ba2195eb4eb996c739.tar.gz | |
Thu Jun 21 22:58:42 UTC 201820180621225842
a/pkgtools-15.0-noarch-20.txz: Rebuilt.
Move pkgtools database to /var/lib/pkgtools/.
Move removed logs to /var/log/pkgtools/.
a/sysvinit-2.90-x86_64-1.txz: Upgraded.
ap/cups-filters-1.20.3-x86_64-3.txz: Rebuilt.
Recompiled against poppler-0.66.0.
kde/calligra-2.9.11-x86_64-22.txz: Rebuilt.
Recompiled against poppler-0.66.0.
l/dbus-python-1.2.8-x86_64-1.txz: Upgraded.
l/gc-7.6.6-x86_64-1.txz: Upgraded.
l/harfbuzz-1.8.1-x86_64-1.txz: Upgraded.
l/poppler-0.66.0-x86_64-1.txz: Upgraded.
Shared library .so-version bump.
l/pulseaudio-12.0-x86_64-1.txz: Upgraded.
n/dhcpcd-7.0.6-x86_64-1.txz: Upgraded.
n/php-7.2.7-x86_64-1.txz: Upgraded.
Added support for libedit.
t/texlive-2017.171108-x86_64-7.txz: Rebuilt.
Recompiled against poppler-0.66.0.
x/libwacom-0.30-x86_64-1.txz: Upgraded.
xfce/exo-0.12.2-x86_64-1.txz: Upgraded.
xfce/tumbler-0.2.1-x86_64-4.txz: Rebuilt.
Recompiled against poppler-0.66.0.
xfce/xfce4-settings-4.12.4-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/a/pkgtools/scripts/pkgtool')
| -rw-r--r-- | source/a/pkgtools/scripts/pkgtool | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/source/a/pkgtools/scripts/pkgtool b/source/a/pkgtools/scripts/pkgtool index 000bb002..076402b8 100644 --- a/source/a/pkgtools/scripts/pkgtool +++ b/source/a/pkgtools/scripts/pkgtool @@ -3,7 +3,7 @@ # Copyright 1993, 1994, 1995, 1996, 1997, 1998, 1999 Patrick Volkerding, Moorhead, MN USA # Copyright 2001, 2004 Slackware Linux, Inc., Concord, CA USA # All rights reserved. -# Copyright 2007, 2009, 2010, 2011, 2013, 2015, 2016 Patrick Volkerding, Sebeka, MN, USA +# Copyright 2007, 2009, 2010, 2011, 2013, 2015, 2016, 2018 Patrick Volkerding, Sebeka, MN, USA # # Redistribution and use of this script, with or without modification, is # permitted provided that the following conditions are met: @@ -23,6 +23,9 @@ # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # +# Mon Jun 4 21:17:58 UTC 2018 +# Use /var/lib/pkgtools, not /var/log. +# # Sat Apr 25 21:18:53 UTC 2009 # Converted to use new pkgbase() function to remove pathname and # valid package extensions. @@ -67,12 +70,12 @@ pkgbase() { echo $PKGRETURN } -SOURCE_DIR=/var/log/mount +SOURCE_DIR=/var/lib/pkgtools/mount ASK="tagfiles" if [ -L /bin/chmod -a -L /bin/chown ]; then # probably on the bootdisk using busybox TARGET_DIR=/mnt rootdevice="$(mount | grep ' on /mnt ' | tail -n 1 | cut -f 1 -d ' ' 2> /dev/null)" - TMP=/mnt/var/log/setup/tmp + TMP=/mnt/var/lib/pkgtools/setup/tmp if ! mount | grep ' on /mnt ' 1> /dev/null 2> /dev/null ; then echo echo @@ -94,13 +97,13 @@ if [ -L /bin/chmod -a -L /bin/chown ]; then # probably on the bootdisk using bus else TARGET_DIR=/ rootdevice="$(mount | grep ' on / ' | tail -n 1 | cut -f 1 -d ' ')" - TMP=/var/log/setup/tmp + TMP=/var/lib/pkgtools/setup/tmp fi if [ ! -d $TMP ]; then mkdir -p $TMP chmod 700 $TMP fi -ADM_DIR=$TARGET_DIR/var/log +ADM_DIR=$TARGET_DIR/var/lib/pkgtools LOG=$TMP/PKGTOOL.REMOVED # remove whitespace @@ -200,7 +203,7 @@ if [ $# -gt 0 ]; then # there are arguments to the command SOURCE_DIR=$2 ; shift 2 ;; -target_dir | --target_dir) TARGET_DIR=$2 - ADM_DIR=$TARGET_DIR/var/log + ADM_DIR=$TARGET_DIR/var/lib/pkgtools shift 2 ;; -source_device | --source_device) SOURCE_DEVICE=$2 ; shift 2 ;; |