Skip to content

Commit 0440395

Browse files
author
emmett1
committed
fix
1 parent 6dddc03 commit 0440395

File tree

2 files changed

+8
-8
lines changed

2 files changed

+8
-8
lines changed

pkgadd

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -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="$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"
288+
rmlist_file="$ROOT_DIR/$SCRATCHPKG_DIR/.rmlist_file"
289+
rmlist_dir="$ROOT_DIR/$SCRATCHPKG_DIR/.rmlist_dir"
290+
reserve_dir="$ROOT_DIR/$SCRATCHPKG_DIR/.reserve_dir"
291+
rmlist_all="$ROOT_DIR/$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="$SCRATCHPKG_DIR/.pkgdel_reserve"
163-
remove="$SCRATCHPKG_DIR/.pkgdel_remove"
164-
dirs="$SCRATCHPKG_DIR/.pkgdel_dirs"
165-
files="$SCRATCHPKG_DIR/.pkgdel_files"
162+
reserve="$ROOT_DIR/$SCRATCHPKG_DIR/.pkgdel_reserve"
163+
remove="$ROOT_DIR/$SCRATCHPKG_DIR/.pkgdel_remove"
164+
dirs="$ROOT_DIR/$SCRATCHPKG_DIR/.pkgdel_dirs"
165+
files="$ROOT_DIR/$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)