Browse Source

Add --verbose option to show which packages will be updated

Georgi Chorbadzhiyski 18 years ago
parent
commit
230af73f44
1 changed files with 24 additions and 10 deletions
  1. 24
    10
      slcheck.sh

+ 24
- 10
slcheck.sh View File

@@ -1,7 +1,7 @@
1 1
 #!/bin/sh
2 2
 # SlackCheck
3 3
 #
4
-# $Id: slcheck.sh,v 1.30 2005/12/20 12:29:13 gf Exp $
4
+# $Id: slcheck.sh,v 1.31 2006/07/06 14:45:24 gf Exp $
5 5
 #
6 6
 # Copyright (c) 2002-2004 Georgi Chorbadzhiyski, Sofia, Bulgaria
7 7
 # All rights reserved.
@@ -59,6 +59,8 @@ usage() {
59 59
 	echo
60 60
 	echo "   --skip-ignore     Skip checks for ignored packages"
61 61
 	echo
62
+	echo "   --verbose         Show more info when update scripts are generated"
63
+	echo
62 64
 	echo " HOW TO UPGRADE CURRENT HOST"
63 65
 	echo "   Run:  $(basename $0) --local --sync --collect --gen --upgrade"
64 66
 	echo
@@ -138,7 +140,11 @@ generate_upgrade_scripts() {
138 140
 		# Check if package list exist
139 141
 		if [ -f ${DIR_PKG}/${HOST} ]
140 142
 		then
141
-			echo -n " > $HOST "
143
+			if [ "$VERBOSE" != "1" ]; then
144
+				echo -n " > $HOST "
145
+			else
146
+				echo    " > $HOST "
147
+			fi
142 148
 			# Cleanup old files
143 149
 			rm ${DIR_UPD}/${FILE_UNKPACKS}${HOST}  >/dev/null 2>&1
144 150
 			rm ${DIR_UPD}/${FILE_UPDATES}${HOST}   >/dev/null 2>&1
@@ -154,20 +160,25 @@ generate_upgrade_scripts() {
154 160
 					distropkg=$(basename $distro_package) # Strip directory
155 161
 					if [ "$distropkg" != "$hostpkg" ]
156 162
 					then
157
-						echo -n .
163
+						if [ "$VERBOSE" != "1" ]; then
164
+							echo -n .
165
+						fi
158 166
 						echo "\
159 167
 UPDATE=\"\$UPDATE ${distro_package}.tgz\" # EXISTING: ${hostpkg} \
160 168
 " >> ${DIR_UPD}/${FILE_UPDATES}${HOST}.newpkgs
161
-#						echo "New: $hostpkg -> $distropkg"
162
-#					else
163
-#						echo "Same: $hostpkg -> $distropkg"
169
+						if [ "$VERBOSE" == "1" ]; then
170
+							echo "  NEW: $hostpkg -> $distropkg ($distro_package)"
171
+						fi
172
+					else
173
+						if [ "$VERBOSE" == "1" ]; then
174
+							echo " SAME: $hostpkg -> $distropkg ($distro_package)"
175
+						fi
164 176
 					fi
165
-				else # Add to unknown packages
166
-#					echo "Unknown: $hostpkg"
167
-					echo "$hostpkg" >> ${DIR_UPD}/${FILE_UNKPACKS}${HOST}
168 177
 				fi
169 178
 			done
170
-			echo
179
+			if [ "$VERBOSE" != "1" ]; then
180
+				echo
181
+			fi
171 182
 			# Skip ignored packages
172 183
 			if [ -s ${DIR_UPD}/${FILE_UPDATES}${HOST}.newpkgs -a \
173 184
 			     -f "do_not_update" -a \
@@ -350,6 +361,9 @@ while [ "$1" != "" ]; do
350 361
 		--upgrade)
351 362
 			DO_UPGRADE="1"
352 363
 		;;
364
+		--verbose)
365
+			VERBOSE="1"
366
+		;;
353 367
 		*)
354 368
 			usage
355 369
 		;;

Loading…
Cancel
Save