From 0625eef097548601df922fac7df7bc16d9a1f814 Mon Sep 17 00:00:00 2001
From: emmett1 <emmett1.2miligrams@gmail.com>
Date: Sun, 23 Dec 2018 00:20:45 +0800
Subject: [PATCH] updated

---
 pkgadd          |  6 ++++--
 pkgdeplist      |  4 ++--
 scratch         | 18 ++++++++----------
 scratchpkg.repo |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/pkgadd b/pkgadd
index 8871232..44481d9 100755
--- a/pkgadd
+++ b/pkgadd
@@ -160,7 +160,7 @@ parse_opts $(extract_opt $@)
 
 INDEX_DIR="$ROOT/var/lib/scratchpkg/index"
 PKGADD_DIR="$ROOT/var/lib/scratchpkg"
-TMP_PKGADD="$PKGADD_DIR/$(basename $0)-$$"
+TMP_PKGADD="$PKGADD_DIR/$(basename $0)-tmp"
 LOCK_FILE="$PKGADD_DIR/spkg.lock"
 TMP_PKGINSTALL="$TMP_PKGADD/$(basename $0).install"
 TMP_PKGINSTALL_BKP="$TMP_PKGADD/$(basename $0).bkp.install"
@@ -177,7 +177,7 @@ if [ "$NOCOLOR" ]; then
 	nocolor
 fi
 
-mkdir -p $INDEX_DIR $PKGADD_DIR $TMP_PKGADD
+mkdir -p $PKGADD_DIR 
 
 # check for lock file
 if [ -f $LOCK_FILE ]; then
@@ -192,6 +192,8 @@ else
 	fi
 fi
 
+mkdir -p $INDEX_DIR $TMP_PKGADD
+
 if [ -n "$PKGNAME" ]; then
 	BASEPKGNAME=$(basename $PKGNAME)
 fi
diff --git a/pkgdeplist b/pkgdeplist
index 1e4aab6..005ae53 100755
--- a/pkgdeplist
+++ b/pkgdeplist
@@ -47,8 +47,8 @@ checkdep() {
 	local depends
 	PORT_PATH=$(getportpath "$1")
 	if [ "$PORT_PATH" ]; then
-		depends=$(grep "^# depends[[:blank:]]*:" $PORT_PATH/spkgbuild | sed 's/^# depends[[:blank:]]*:[[:blank:]]*//')
-		source $PORT_PATH/spkgbuild
+		depends=$(grep "^# depends[[:blank:]]*:" $PORT_PATH/spkgbuild | sed 's/^# depends[[:blank:]]*:[[:blank:]]*//' | tr ' ' '\n' | awk '!a[$0]++')
+		#source $PORT_PATH/spkgbuild
 		for dep in ${depends[@]}; do
 			echo $dep
 		done
diff --git a/scratch b/scratch
index 5d7bd26..ec9a2a5 100755
--- a/scratch
+++ b/scratch
@@ -138,10 +138,7 @@ missingdep() {
 	
 	for pkg in $(allinstalled); do
 		if [ $(getportpath "$pkg") ]; then
-			pushd $(getportpath "$pkg")
-				depends=$(grep "^# depends[[:blank:]]*:" $BUILD_SCRIPT | sed 's/^# depends[[:blank:]]*:[[:blank:]]*//')
-				. $BUILD_SCRIPT
-			popd
+			depends=$(grep "^# depends[[:blank:]]*:" $(getportpath "$pkg")/$BUILD_SCRIPT | sed 's/^# depends[[:blank:]]*:[[:blank:]]*//' | tr ' ' '\n' | awk '!a[$0]++')
 		fi
 		if [ "$depends" ]; then
 			for d in ${depends[@]}; do
@@ -217,8 +214,7 @@ listorphan() {
 	
 	for pkg in $(allinstalled); do
 		if [ $(getportpath $pkg) ]; then
-			depends=$(grep "^# depends[[:blank:]]*:" $(getportpath $pkg)/$BUILD_SCRIPT | sed 's/^# depends[[:blank:]]*:[[:blank:]]*//')
-			. $(getportpath $pkg)/$BUILD_SCRIPT
+			depends=$(grep "^# depends[[:blank:]]*:" $(getportpath $pkg)/$BUILD_SCRIPT | sed 's/^# depends[[:blank:]]*:[[:blank:]]*//' | tr ' ' '\n' | awk '!a[$0]++')
 		fi
 		for deps in ${depends[@]}; do
 			ALL_DEP+=($deps)
@@ -299,10 +295,7 @@ showdepends() {
 	local dep
 	
 	if [ $(getportpath "$1") ]; then
-		pushd $(getportpath "$1")
-			depends=$(grep "^# depends[[:blank:]]*:" $BUILD_SCRIPT | sed 's/^# depends[[:blank:]]*:[[:blank:]]*//')
-			. $BUILD_SCRIPT
-		popd
+		depends=$(grep "^# depends[[:blank:]]*:" $(getportpath "$1")/$BUILD_SCRIPT | sed 's/^# depends[[:blank:]]*:[[:blank:]]*//' | tr ' ' '\n' | awk '!a[$0]++')
 	else
 		msgerr "Port '$1' not exist."
 		exit 1
@@ -403,6 +396,11 @@ printreadme() {
 searchpkg() {
 	needarg $@
 	
+	case $1 in
+		-*) msgerr "Invalid pattern '$1'"
+			return 1 ;;
+	esac
+	
 	local port found OUTPUT
 	
 	for port in ${PORT_REPO[@]}; do
diff --git a/scratchpkg.repo b/scratchpkg.repo
index 79638c2..4164849 100644
--- a/scratchpkg.repo
+++ b/scratchpkg.repo
@@ -8,10 +8,10 @@
 /usr/ports/multilib https://raw.githubusercontent.com/emmett1/ports/master/multilib
 /usr/ports/core     https://raw.githubusercontent.com/emmett1/ports/master/core
 /usr/ports/xorg     https://raw.githubusercontent.com/emmett1/ports/master/xorg
+/usr/ports/extra    https://raw.githubusercontent.com/emmett1/ports/master/extra
 /usr/ports/xfce4    https://raw.githubusercontent.com/emmett1/ports/master/xfce4
 /usr/ports/kf5      https://raw.githubusercontent.com/emmett1/ports/master/kf5
 /usr/ports/mate     https://raw.githubusercontent.com/emmett1/ports/master/mate
 /usr/ports/lxde     https://raw.githubusercontent.com/emmett1/ports/master/lxde
-/usr/ports/extra    https://raw.githubusercontent.com/emmett1/ports/master/extra
 /usr/ports/git      https://raw.githubusercontent.com/emmett1/ports/master/git
 /usr/ports/wip      https://raw.githubusercontent.com/emmett1/ports/master/wip