From 6dddc034f98c99ebf8da112a3b2ca3c0ca016fd5 Mon Sep 17 00:00:00 2001 From: emmett1 Date: Mon, 10 Feb 2020 00:18:14 +0800 Subject: [PATCH] updated --- pkgadd | 10 +++++----- pkgdel | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgadd b/pkgadd index d2b9eb2..d41e95c 100755 --- a/pkgadd +++ b/pkgadd @@ -129,8 +129,8 @@ run_scripts() { parse_opts $(extract_opts "$@") -INDEX_DIR="var/lib/scratchpkg/index" SCRATCHPKG_DIR="var/lib/scratchpkg" +INDEX_DIR="$SCRATCHPKG_DIR/index" LOCK_FILE="$SCRATCHPKG_DIR/spkg.lock" # show help page @@ -285,10 +285,10 @@ done # remove old files from old package that not exist in new package if [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then - rmlist_file="/tmp/.rmlist_file.$$" - rmlist_dir="/tmp/.rmlist_dir.$$" - reserve_dir="/tmp/.reserve_dir.$$" - rmlist_all="/tmp/.rmlist_all.$$" + rmlist_file="$SCRATCHPKG_DIR/.rmlist_file" + rmlist_dir="$SCRATCHPKG_DIR/.rmlist_dir" + reserve_dir="$SCRATCHPKG_DIR/.reserve_dir" + rmlist_all="$SCRATCHPKG_DIR/.rmlist_all" grep '/$' $ROOT_DIR/$INDEX_DIR/*/.files \ | grep -v $ROOT_DIR/$INDEX_DIR/$name/.files \ | awk -F : '{print $2}' \ diff --git a/pkgdel b/pkgdel index da0ab28..fc3b8aa 100755 --- a/pkgdel +++ b/pkgdel @@ -159,10 +159,10 @@ if [ -z "$name" ] && [ -z "$version" ] && [ -z "$release" ]; then fi # create list for reserve and remove (dirs and files) -reserve="/tmp/.pkgdel_reserve.$$" -remove="/tmp/.pkgdel_remove.$$" -dirs="/tmp/.pkgdel_dirs.$$" -files="/tmp/.pkgdel_files.$$" +reserve="$SCRATCHPKG_DIR/.pkgdel_reserve" +remove="$SCRATCHPKG_DIR/.pkgdel_remove" +dirs="$SCRATCHPKG_DIR/.pkgdel_dirs" +files="$SCRATCHPKG_DIR/.pkgdel_files" grep '/$' $ROOT_DIR/$INDEX_DIR/*/.files \ | grep -v "$ROOT_DIR/$INDEX_DIR/$name" \