X-Git-Url: https://hackdaworld.org/gitweb/?a=blobdiff_plain;f=misc%2Fhdw-tools%2Fhdw-get;h=0f785fb353be6e225946b2bab2098ff524130ebd;hb=829c5beacbfa0e91795a478fe4ea8b3232014372;hp=5cb2e40b0b08b6c269bbaf6d369bca28e52083a8;hpb=2b6dfb448cf086bb899f505626c9e114e4971bd2;p=hdw-linux%2Fhdw-linux.git

diff --git a/misc/hdw-tools/hdw-get b/misc/hdw-tools/hdw-get
index 5cb2e40..0f785fb 100644
--- a/misc/hdw-tools/hdw-get
+++ b/misc/hdw-tools/hdw-get
@@ -43,7 +43,7 @@ if [ -f /etc/hdw-get.conf ] ; then
 		echo "adjust /etc/hdw-get.conf file"
 		exit
 	else
-		echo "hdw-get.conf file looks good ..."
+		[ "$verbose" ] && echo "hdw-get.conf file looks good ..."
 	fi
 else
 	echo "/etc/hdw-get.conf file not found, aborting"
@@ -84,7 +84,9 @@ if [ "$remove" = "1" ] ; then
 			 awk -F/ '{ print $4 }'`; do
 		info_o=`echo $info_obj | sed 's/.info//'`
 		[ "$verbose" ] && echo "deleting $info_o from info/dir"
-		grep -v \($info_o\)\. /tmp/.hdw-get/dir > /tmp/.hdw-get/dir~
+		grep -v \($info_o\)\. /tmp/.hdw-get/dir | \
+		grep -v ^$package\ info\ -\ added\ by\ hdw > \
+		/tmp/.hdw-get/dir~
 		mv /tmp/.hdw-get/dir~ /tmp/.hdw-get/dir
 	done
 	fi
@@ -160,10 +162,11 @@ elif [ "$install" = "1" ] ; then
 	fi
 
 	# merging info/dir file
-	fl_file=`ls -A $inst_root/var/adm/flists/$package-[0-9]* | tail -1`
+	pkg=`basename $package | sed 's/.tar.bz2//'`
+	fl_file=`ls -A $inst_root/var/adm/flists/$pkg-[0-9]* | tail -1`
 	if [ -n "`grep usr/share/info/dir $fl_file`" ] ; then
 		echo "" >> /tmp/.hdw-get/dir
-		echo "$package info - added by hdw `date`" >> /tmp/.hdw-get/dir
+		echo "$pkg info - added by hdw `date`" >> /tmp/.hdw-get/dir
 		for info_obj in `grep 'usr/share/info/.*.info' $fl_file | \
 					awk -F/ '{ print $4 }'`; do
 			info_o=`echo $info_obj | sed 's/.info//'`