diff options
| author | Robby Workman <rworkman@slackware.com> | 2017-12-30 00:53:53 -0600 |
|---|---|---|
| committer | Robby Workman <rworkman@slackware.com> | 2018-01-02 17:58:49 -0600 |
| commit | 70948050f908f92a92bb51bc21eaf2730a0a070a (patch) | |
| tree | 3fcfcdd38ca4e8457bd1ab94a0c3bacd15929977 /files/slackpkg | |
| parent | c73c1a90087aa9f344e63bcad2b922a3ce7ab83b (diff) | |
| download | slackpkg-70948050f908f92a92bb51bc21eaf2730a0a070a.tar.xz | |
Add $ROOT to $WORKDIR, $TEMP, and $TMPDIR instances
This *should* have no effect if $ROOT is blank
Files modified:
files/core-functions.sh
files/slackpkg
Diffstat (limited to 'files/slackpkg')
| -rw-r--r-- | files/slackpkg | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/files/slackpkg b/files/slackpkg index 4fcdd61..cec2ddd 100644 --- a/files/slackpkg +++ b/files/slackpkg @@ -42,10 +42,11 @@ ERROR="" # Set temporary directory # -TMPDIR=$(mktemp -p /tmp -d slackpkg.XXXXXX 2>/dev/null) +mkdir -p ${ROOT}/tmp +TMPDIR=$(mktemp -p ${ROOT}/tmp -d slackpkg.XXXXXX 2>/dev/null) if [ $? -ne 0 ]; then - TMPDIR="/tmp/slackpkg.${RANDOM}" - mkdir -m 700 $TMPDIR || TMPDIR="FAILED" + TMPDIR="${ROOT}/tmp/slackpkg.${RANDOM}" + mkdir -p -m 700 $TMPDIR || TMPDIR="FAILED" fi # @@ -485,7 +486,7 @@ case "$CMD" in if ( found != 1 ) { print \"No packages found! Try:\n\n\tslackpkg search $PATTERN\n\nand choose one (and ONLY one package).\n\" } - }" ${WORKDIR}/PACKAGES.TXT 2>/dev/null + }" ${ROOT}/${WORKDIR}/PACKAGES.TXT 2>/dev/null ;; new-config) POSTINST=on |