From 596ce96746d58b888f99da19340323e031f63ab2 Mon Sep 17 00:00:00 2001
From: emmett1 <emmett1.2miligrams@gmail.com>
Date: Wed, 27 Jun 2018 21:17:26 +0800
Subject: [PATCH] updated

---
 installpkg | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/installpkg b/installpkg
index 9b96a65..8ebcd71 100755
--- a/installpkg
+++ b/installpkg
@@ -65,12 +65,10 @@ installpkg() {
 	
 	#installing package into system
 	msg2 "Extracting package..."
-	installcmd() {
-		tar --keep-directory-symlink -p -x -v -f $1 -C $ROOT_DIR --exclude=.pkginfo --exclude=.pkginstall --exclude=.pkgreadme ${excludefile[@]}
-	}
-	
+	installcmd="tar --keep-directory-symlink -p -x -v -f $PKGNAME -C $ROOT_DIR --exclude=.pkginfo --exclude=.pkginstall --exclude=.pkgreadme ${excludefile[@]}"
+
 	rm -f /tmp/spkginstall.$name
-	LC_ALL= installcmd $PKGNAME | while IFS=' ' read line; do 
+	LC_ALL= $installcmd | while IFS=' ' read line; do 
 		if [ "$line" = "${line%.*}.spkgnew" ]; then
 			line=${line%.*}
 			if [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then
@@ -83,17 +81,6 @@ installpkg() {
 		fi
 		echo "$line" >> /tmp/spkginstall.$name
 	done
-	
-	#if [ $? != 0 ]; then
-		#msgerr "Failed install ${RED}$name-$version-$release${CRESET}."
-			#while IFS=' ' read -r line; do
-				#pushd $ROOT_DIR
-						#rm_silent "$line" || rmdir_silent --ignore-fail-on-non-empty "$line"
-				#popd
-			#done < <(tar -tf "$PKGNAME" --exclude=.pkginfo --exclude=.pkginstall --exclude=.pkgreadme ${excludefile[@]} | tac)
-		#spkglock
-		#exit 1
-	#fi
 		
 	if [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then
 		msg2 "Removing old files..."