Browse Source

Fixed bug when autoupdating modutils

Fixed bug when there are two packages with the same names
Georgi Chorbadzhiyski 20 years ago
parent
commit
746e7a3fc7
1 changed files with 4 additions and 3 deletions
  1. 4
    3
      update_script.sh

+ 4
- 3
update_script.sh View File

@@ -121,9 +121,9 @@ mkdir ${REMOTE_DIR} 2>/dev/null
121 121
 		for PKG in $UPDATE; do
122 122
 			pkgfile=`basename $PKG`
123 123
 			if [ "$SIG_CHECK" == "1" ]; then
124
-				grep /$pkgfile CHECKSUMS.md5 | sed -e 's|\./.*/||' > ${pkgfile}.md5
124
+				grep /$pkgfile CHECKSUMS.md5 | head -1 | sed -e 's|\./.*/||' > ${pkgfile}.md5
125 125
 			else
126
-				grep /$pkgfile CHECKSUMS.md5 | sed -e 's|\./.*/||' | grep -v .asc$ > ${pkgfile}.md5
126
+				grep /$pkgfile CHECKSUMS.md5 | head -1 | sed -e 's|\./.*/||' | grep -v .asc$ > ${pkgfile}.md5
127 127
 			fi
128 128
 			md5sum -c ${pkgfile}.md5
129 129
 		done
@@ -175,7 +175,8 @@ mkdir ${REMOTE_DIR} 2>/dev/null
175 175
 	# Replace modutils with module-init-tools, for more info see
176 176
 	# slackware-current ChangeLog (Thu Sep 4 19:40:01 PDT 2003)
177 177
 	if [ "$PKG_MODULEINITTOOLS" != "" ]; then
178
-		if [ "`ls /var/adm/packages/module-init-tools-* 2>/dev/null`" = "" ]; then
178
+		if [ "`ls /var/adm/packages/module-init-tools-* 2>/dev/null`" = "" -a \
179
+		     "`ls /var/adm/packages/modutils-* 2>/dev/null`" != "" ]; then
179 180
 			pkg_upgrade "module-init-tools package is not installed! Installing it." $PKG_MODULEINITTOOLS modutils
180 181
 		fi
181 182
 	fi

Loading…
Cancel
Save