Skip to content

Commit 6dddc03

Browse files
author
emmett1
committed
updated
1 parent 4d8f539 commit 6dddc03

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

pkgadd

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,8 +129,8 @@ run_scripts() {
129129

130130
parse_opts $(extract_opts "$@")
131131

132-
INDEX_DIR="var/lib/scratchpkg/index"
133132
SCRATCHPKG_DIR="var/lib/scratchpkg"
133+
INDEX_DIR="$SCRATCHPKG_DIR/index"
134134
LOCK_FILE="$SCRATCHPKG_DIR/spkg.lock"
135135

136136
# show help page
@@ -285,10 +285,10 @@ done
285285

286286
# remove old files from old package that not exist in new package
287287
if [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then
288-
rmlist_file="/tmp/.rmlist_file.$$"
289-
rmlist_dir="/tmp/.rmlist_dir.$$"
290-
reserve_dir="/tmp/.reserve_dir.$$"
291-
rmlist_all="/tmp/.rmlist_all.$$"
288+
rmlist_file="$SCRATCHPKG_DIR/.rmlist_file"
289+
rmlist_dir="$SCRATCHPKG_DIR/.rmlist_dir"
290+
reserve_dir="$SCRATCHPKG_DIR/.reserve_dir"
291+
rmlist_all="$SCRATCHPKG_DIR/.rmlist_all"
292292
grep '/$' $ROOT_DIR/$INDEX_DIR/*/.files \
293293
| grep -v $ROOT_DIR/$INDEX_DIR/$name/.files \
294294
| awk -F : '{print $2}' \

pkgdel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,10 +159,10 @@ if [ -z "$name" ] && [ -z "$version" ] && [ -z "$release" ]; then
159159
fi
160160

161161
# create list for reserve and remove (dirs and files)
162-
reserve="/tmp/.pkgdel_reserve.$$"
163-
remove="/tmp/.pkgdel_remove.$$"
164-
dirs="/tmp/.pkgdel_dirs.$$"
165-
files="/tmp/.pkgdel_files.$$"
162+
reserve="$SCRATCHPKG_DIR/.pkgdel_reserve"
163+
remove="$SCRATCHPKG_DIR/.pkgdel_remove"
164+
dirs="$SCRATCHPKG_DIR/.pkgdel_dirs"
165+
files="$SCRATCHPKG_DIR/.pkgdel_files"
166166

167167
grep '/$' $ROOT_DIR/$INDEX_DIR/*/.files \
168168
| grep -v "$ROOT_DIR/$INDEX_DIR/$name" \

0 commit comments

Comments
 (0)