diff options
Diffstat (limited to 'source/a/pkgtools/scripts')
-rw-r--r-- | source/a/pkgtools/scripts/installpkg | 4 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/removepkg | 2 | ||||
-rw-r--r-- | source/a/pkgtools/scripts/upgradepkg | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/source/a/pkgtools/scripts/installpkg b/source/a/pkgtools/scripts/installpkg index 87a7f57ac..453e391e3 100644 --- a/source/a/pkgtools/scripts/installpkg +++ b/source/a/pkgtools/scripts/installpkg @@ -126,7 +126,7 @@ fi # screen corruption (from multiple dialogs) and install script collisions # (from multiple scripts trying to work on the same files) in the case of # parallel instances of installpkg. -INSTLOCKDIR=${INSTLOCKDIR:-/run/installpkg-lock} +INSTLOCKDIR=${INSTLOCKDIR:-/run/lock/pkgtools} if [ ! -d $INSTLOCKDIR ]; then mkdir -p $INSTLOCKDIR fi @@ -545,7 +545,7 @@ EOF fi elif [ "$MODE" = "terse" ]; then # emit a single description line ( flock 9 || exit 11 - printf "%-$(expr $TERSELENGTH - 7)s %-6s\n" "$(echo $shortname: $(echo $(cat $DESCRIPTION | grep "^$packagebase:" | sed "s/^$packagebase: //g" | head -n 1 | tr -d '()' | sed "s/^$packagebase //g" ) $(echo " $(printf '.%.0s' {1..256})")) | cut -b1-$(expr $TERSELENGTH - 7))" "$(printf "[%4s]" $UNCOMPRESSED)" + printf "%-$(expr $TERSELENGTH - 7)s %-6s\n" "$(echo $shortname: $(echo $(cat $DESCRIPTION | grep "^$packagebase:" | sed "s/^$packagebase: //g" | head -n 1 | tr -d '()' | sed "s/^$packagebase //g" ) $(echo " $(printf '.%.0s' {1..256})")) | cut -b1-$(expr $TERSELENGTH - 7))" "$(printf "[%4s]" $UNCOMPRESSED)" | cut -b 1-${TERSELENGTH} ) 9> $INSTLOCKDIR/dialog.lock elif [ "$MODE" = "infobox" ]; then # install infobox package ( flock 9 || exit 11 diff --git a/source/a/pkgtools/scripts/removepkg b/source/a/pkgtools/scripts/removepkg index 14af10f37..81b2a6be0 100644 --- a/source/a/pkgtools/scripts/removepkg +++ b/source/a/pkgtools/scripts/removepkg @@ -146,7 +146,7 @@ PRES_DIR=$TMP/preserved_packages # Lock directory for ldconfig... share it with installpkg so that upgradepkg # becomes properly ldconfig-locked, too. -INSTLOCKDIR=${INSTLOCKDIR:-/run/installpkg-lock} +INSTLOCKDIR=${INSTLOCKDIR:-/run/lock/pkgtools} if [ ! -d $INSTLOCKDIR ]; then mkdir -p $INSTLOCKDIR fi diff --git a/source/a/pkgtools/scripts/upgradepkg b/source/a/pkgtools/scripts/upgradepkg index f943f9360..bb150483a 100644 --- a/source/a/pkgtools/scripts/upgradepkg +++ b/source/a/pkgtools/scripts/upgradepkg @@ -113,7 +113,7 @@ fi # Create a lockfile directory if it doesn't exist. We can use it to prevent # output line collisions in --terse mode. -INSTLOCKDIR=${INSTLOCKDIR:-/run/upgradepkg-lock} +INSTLOCKDIR=${INSTLOCKDIR:-/run/lock/pkgtools} if [ ! -d $INSTLOCKDIR ]; then mkdir -p $INSTLOCKDIR fi |