Browse Source

Change update order

Georgi Chorbadzhiyski 15 years ago
parent
commit
c83b347803
1 changed files with 6 additions and 9 deletions
  1. 6
    9
      slcheck.sh

+ 6
- 9
slcheck.sh View File

@@ -1,7 +1,7 @@
1 1
 #!/bin/sh
2 2
 # SlackCheck
3 3
 #
4
-# $Id: slcheck.sh,v 1.39 2009/05/10 12:47:43 gf Exp $
4
+# $Id: slcheck.sh,v 1.40 2009/05/20 08:48:04 gf Exp $
5 5
 #
6 6
 # Copyright (c) 2002-2006 Georgi Chorbadzhiyski, Sofia, Bulgaria
7 7
 # All rights reserved.
@@ -265,16 +265,13 @@ UPDATE=\"\$UPDATE ${distro_package_ext}\" # EXISTING: ${hostpkg} \
265 265
 				 echo
266 266
 				 echo "# If you don't want package to be updated just delete the line."
267 267
 				 echo
268
-				 # Put glibc and elflibs updates first, otherwise
269
-				 # something may broke
270
-				 # workarounds
268
+				 # pkgtools and tar must be first
269
+				 # glibc and elflibs next
270
+				 cat ${DIR_UPD}/${FILE_UPDATES}${HOST}.newpkgs | grep a/pkgtools
271
+				 cat ${DIR_UPD}/${FILE_UPDATES}${HOST}.newpkgs | grep a/tar
271 272
 				 cat ${DIR_UPD}/${FILE_UPDATES}${HOST}.newpkgs | grep a/glibc
272 273
 				 cat ${DIR_UPD}/${FILE_UPDATES}${HOST}.newpkgs | grep a/elflibs
273
-				 cat ${DIR_UPD}/${FILE_UPDATES}${HOST}.newpkgs | grep a/pkgtools
274
-				 cat ${DIR_UPD}/${FILE_UPDATES}${HOST}.newpkgs | \
275
-				    grep -v a/glibc | \
276
-				    grep -v a/elflibs | \
277
-				    grep -v a/pkgtools
274
+				 cat ${DIR_UPD}/${FILE_UPDATES}${HOST}.newpkgs | grep -v -E "a/(pkgtools|tar|glibc|elflibs)"
278 275
 				 echo "PKG_SED=\"`grep sed- ${DIR_PKG}/${FILE_NEWEST} 2>/dev/null`\"";
279 276
 				 echo "PKG_COREUTILS=\"`grep coreutils- ${DIR_PKG}/${FILE_NEWEST} 2>/dev/null`\"";
280 277
 				 echo "PKG_UTEMPTER=\"`grep utempter- ${DIR_PKG}/${FILE_NEWEST} 2>/dev/null`\"";

Loading…
Cancel
Save