X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=misc%2Fhdw-tools%2Fhdw-get;h=594325299ddddbf5c564672f8d1e6bddc9d6ebad;hb=b0440f88c93c86fb5ada4eb5f5c3fab796756585;hp=7f2d1e6202cde775ae18b47813355ac7e272f162;hpb=f5392ac6a08f8ee45154ab0ce31db7ed6a668920;p=hdw-linux%2Fhdw-linux.git

diff --git a/misc/hdw-tools/hdw-get b/misc/hdw-tools/hdw-get
index 7f2d1e6..5943252 100644
--- a/misc/hdw-tools/hdw-get
+++ b/misc/hdw-tools/hdw-get
@@ -130,10 +130,10 @@ if [ "$remove" = "1" ] ; then
 	if [ "$simulate" != "1" ] ; then
 
 	# remove the files/dirs
-	((supposed = 0))
-	((counter = 0))
+	#((supposed = 0))
+	#((counter = 0))
 	cat $fl_file | while read pkg file; do
-		((supposed += 1))
+		#((supposed += 1))
 		if [ -e $inst_root/$file ] ; then
 			if [ "$file" != "tmp" ] ; then
 			if [ -d $inst_root/$file ] ; then
@@ -142,10 +142,10 @@ if [ "$remove" = "1" ] ; then
 				rm -f $inst_root/$file > /dev/null 2>&1
 				rmdir -p `dirname $file` > /dev/null 2>&1
 			fi
-			((counter += 1))
+			#((counter += 1))
 			fi
 		fi
-		echo -en "\rremoved $counter from $supposed supposed files"
+		#echo -en "\rremoved $counter from $supposed supposed files"
 	done
 	echo -en "\ndone.\n"
 
@@ -194,8 +194,8 @@ elif [ "$install" = "1" ] ; then
 		udeps=""
 		tudeps=""
 		for dep in $deps; do
-			[ ! -f $inst_root/$FL_DIR/$dep-[0-9]* ] && \
-				[ "$pkg" != "$dep" ] && \
+			[ "$dep" != "$pkg" ] &&
+				[ ! -f $inst_root/$FL_DIR/$dep-[0-9]* ] && \
 					udeps="$dep $udeps"
 		done
 		while [ "$udeps" != "$tudeps" ] ; do
@@ -204,23 +204,24 @@ elif [ "$install" = "1" ] ; then
 				deps="`grep "^$tdep\ -" $DBF | sed 's/.* -//'`"
 				for dep in $deps; do
 					exists=0
+					[ "$dep" = "$pkg" ] && break
 					[ -f $inst_root/$FL_DIR/$dep-* ] && \
 						break
 					for i in $udeps; do
 						[ "$i" = "$dep" ] && exists=1
 					done
 					[ "$exists" = "0" ] && \
-						[ "$dep" != "$pkg" ] && \
-							udeps="$udeps $dep"
+						udeps="$udeps $dep"
 				done
 			done
 		done
-		if [ -n "$udeps" ] ; then
-			echo "$pkg has unresolved dependencies:"
-			echo "-> $udeps <-"
+		if [ ".$udeps" != "." ] ; then
+			echo "$pkg uninstalled depends:"
+			echo "$udeps"
 			echo
 			echo "continue? [y,n] (default 'n')"
-			if [ -z $auto_resolve_deps ] ; then
+			answer="n"
+			if [ "$auto_resolve_deps" != "1" ] ; then
 				read answer
 				if [ "$answer" = "y" ] ; then
 					for i in $udeps; do
@@ -232,7 +233,7 @@ elif [ "$install" = "1" ] ; then
 		fi
 	fi
 	
-	if [ "$simulate" != "1" -a "$answer" != "n" ] ; then
+	if [ "$simulate" != "1" -a "$answer" = "y" ] ; then
 	
 	# check/install package
 	if [ -f $package ] ; then