X-Git-Url: http://ftp.carnet.hr/pub/carnet-debian/scm?a=blobdiff_plain;f=src%2Ffunctions.sh;h=6f85840ef4085107bfcc659bac3aa79ec6ea257b;hb=50191049f5c1d7b823bc4a018e989bdd6596d0ed;hp=fc5e65d5a3c6b9de04366f460bfeab83ddaac93f;hpb=7bf6d65fccb92a509ce93595e5de2e2dc675cd6b;p=carnet-upgrade.git

diff --git a/src/functions.sh b/src/functions.sh
index fc5e65d..6f85840 100644
--- a/src/functions.sh
+++ b/src/functions.sh
@@ -303,7 +303,7 @@ what_upgrade () {
 # funkcija za ispis paketa koje treba upgradeati
 check_upgrade () {
   local upgrade
-  upgrade="`what_upgrade`"
+  upgrade=${1:-"`what_upgrade`"}
 
   if [ "$upgrade" ]; then
     notice "
@@ -323,6 +323,29 @@ Nakon toga ponovno pozovite ovu skriptu."
   fi
 }
 
+# try to check if we are using the latest version of carnet-upgrade script
+check_my_version () {
+  local packages latest_version
+
+  packages=$(mktemp /var/lib/carnet-upgrade/Packages.XXXXXX)
+  if wget -q -O$packages $packages_uri; then
+    latest_version=$(sed -ne \
+        '/Package: carnet-upgrade/,/Description:/{ /Version: /s///p }' \
+        $packages)
+    rm -f $packages
+
+    if [ "$latest_version" ]; then
+      log "Running carnet-upgrade version is $version"
+      log "Latest carnet-upgrade version is $latest_version"
+      if dpkg --compare-versions "$version" lt "$latest_version"; then
+        check_upgrade " carnet-upgrade"
+      else log "Already using the latest carnet-upgrade version."; fi
+    else log "Failed to get latest version, skipping check."; fi
+  else log "Failed to download Packages file, skipping check."; fi
+
+  rm -f $packages
+}
+
 # if apache is installed make sure it's version 2
 check_apache_version () {
 
@@ -350,7 +373,7 @@ check_grsec_kernel () {
     return 0
   fi
 
-  if [ "$ver" = "${ver#2.6.2[2-9]}" ]; then
+  if [ "$ver" = "${ver#2.6.2[4-9]}" ]; then
     # kernel too old
     notice "
 Prije prelaska na Debian Etch potrebno je napraviti nadogradnju na najnoviji grsec kernel.