[26279] in Source-Commits
/svn/athena r25488 - trunk/debathena/config/auto-update/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon May 7 21:17:32 2012
Date: Mon, 7 May 2012 21:17:30 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201205080117.q481HUwr025522@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-05-07 21:17:30 -0400 (Mon, 07 May 2012)
New Revision: 25488
Modified:
trunk/debathena/config/auto-update/debian/athena-auto-upgrade
Log:
Fix whitespace: convert tabs to spaces
Modified: trunk/debathena/config/auto-update/debian/athena-auto-upgrade
===================================================================
--- trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2012-05-08 01:06:36 UTC (rev 25487)
+++ trunk/debathena/config/auto-update/debian/athena-auto-upgrade 2012-05-08 01:17:30 UTC (rev 25488)
@@ -18,14 +18,14 @@
d)
DEBUG=1
FAKE=1
- UPGRADE_ANYWAY=yes
+ UPGRADE_ANYWAY=yes
;;
f)
FORCE=1
- ;;
+ ;;
t)
- UPGRADE_TO_TESTING=yes
- ;;
+ UPGRADE_TO_TESTING=yes
+ ;;
v) # Spam level
VERBOSE=1
;;
@@ -40,7 +40,7 @@
END
- ;;
+ ;;
esac
done
@@ -50,7 +50,7 @@
exit 2
fi
if [ $FORCE -eq 1 ]; then
- echo "Using -f is a terrible idea. Press Ctrl-C to reconsider and"
+ echo "Using -f is a terrible idea. Press Ctrl-C to reconsider and"
echo "save your machine, or Enter to continue."
read r
fi
@@ -82,9 +82,9 @@
function complain() {
if [ $DEBUG -eq 1 ]; then
- echo "ERROR: $*"
+ echo "ERROR: $*"
else
- logger -t "athena-auto-upgrade" -p user.notice "$*"
+ logger -t "athena-auto-upgrade" -p user.notice "$*"
fi
}
@@ -137,26 +137,26 @@
# Only run this on cluster
if [ "$(machtype -L)" != "debathena-cluster" ] && \
[ "$UPGRADE_ANYWAY" != "yes" ]; then
- debug "Not a cluster machine and UPGRADE_ANYWAY != yes.".
- exit 0
+ debug "Not a cluster machine and UPGRADE_ANYWAY != yes.".
+ exit 0
fi
# Bail if someone is logged in (stolen from auto-update)
ttys=$(w -h -s | awk '{print $2}')
for tty in $ttys; do
- pids=$(ps --no-heading -j -t "$tty" 2>/dev/null \
+ pids=$(ps --no-heading -j -t "$tty" 2>/dev/null \
| awk '($1 == $3) {print $1}')
- if [ -n "$pids" ]; then
- debug "Users logged in, won't continue."
- debug "PIDs: $pids"
- maybe_quit
- fi
+ if [ -n "$pids" ]; then
+ debug "Users logged in, won't continue."
+ debug "PIDs: $pids"
+ maybe_quit
+ fi
done
# screen processes count as logins.
if pgrep '^screen' > /dev/null; then
- debug "Screen processes found, won't continue."
- maybe_quit
+ debug "Screen processes found, won't continue."
+ maybe_quit
fi
fi
export CLUSTERINFO=$(getcluster -b $(lsb_release -sr))
