Changeset 185

Timestamp:

Sep 28, 2010, 12:18:01 PM (14 years ago)

Author:

Rick van der Zwet

Message:

Make the script KISS

File:

• freebsd-mgnt/system-update.sh (modified) (3 diffs)

freebsd-mgnt/system-update.sh

@@ -6 +6 @@
 
 . /etc/rc.subr
+
+ask_question() {
+  QUESTION=$1
+  DEFAULT=$2
+  echo -n "$QUESTION? [$DEFAULT]: "; read INPUT
+  INPUT=${INPUT:-"${DEFAULT}"}
+  checkyesno INPUT || return 1 && return 0
+
+}
+
 
 if [ `id -u` -ne 0 ]; then
@@ -15 +25 @@
 BATCH=${BATCH-""}
 
-$DIRNAME/port-list.sh
+# Get list of rc.d marked for updates
+RC_FILES=`$DIRNAME/port-list.sh`
 
 # Update port tree
-echo "# Updating portstree .."
-portsnap update
+echo "# Updating portstree ..."
+portsnap update > /dev/null
 
 # Update ports listing
@@ -30 +41 @@
 fi
 
+#
+# Update ports
 if [ -z "$BATCH" ]; then
   # Make sure we have read the (new) UPDATING announcements
-  less /usr/ports/UPDATING
+  # Use ls to display the last motification time of the directories in
+  # /var/db/pkg and assume that is the last time the user read the 
+  # UPDATING file
+  LAST_UPDATED=`ls -rtlD '%Y%m%d' /var/db/pkg/ | awk 'END{print $6}'`
 
+  # Find new entries
+  TMPFILE=`mktemp -t $(basename $0).XXX`
+  awk -F: -v last=$LAST_UPDATED '{if (match($0,"^[0-9]+:$") && $1 < last) {exit}; print $0}' /usr/ports/UPDATING > $TMPFILE
+
+  echo "# Show new /usr/ports/UPDATING entries (starting from $LAST_UPDATED) ..."
+  if [`cat $TMPFILE | wc -l` -eq 7 ]; then
+    echo "## No new entries found"
+  else
+   cat $TMPFILE
+  fi
+  rm $TMPFILE
+  
+  # agree to the terms of the game
   echo $NEWPORTS
-  # And agree to the terms of the game
-  echo -n "Do you like to upgrade the affected ports [no]: "; read INPUT
+  ask_question "Do you like to upgrade the affected ports" "no" || exit 1
 
-  INPUT=${INPUT:-"no"}
-  checkyesno INPUT || exit 1
-  echo "Foo"
+  #
+  # Stop daemons
+  echo $RC_FILES
+  ask_question "Do you like to stop your deamons" "yes" || exit
+  for RC_FILE in $RC_FILES; do
+    $RC_FILE stop
+  done
+
 fi
+portupgrade -r -mBATCH=yes -a $NEWPORTS
 
-portupgrade -r -mBATCH=yes -a $NEWPORTS
+#
+# Restart daemons
+echo $RC_FILES
+ask_question "Do you like to restart your deamons" "yes" || exit
+for RC_FILE in $RC_FILES; do
+  $RC_FILE restart 
+done
+