[23838] in Source-Commits
/svn/athena r23449 - trunk/debathena/debathena/xsession/debian
daemon@ATHENA.MIT.EDU (broder@MIT.EDU)
Thu Feb 5 01:33:34 2009
Date: Thu, 5 Feb 2009 01:33:08 -0500 (EST)
From: broder@MIT.EDU
Message-Id: <200902050633.BAA25118@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: broder
Date: 2009-02-05 01:33:07 -0500 (Thu, 05 Feb 2009)
New Revision: 23449
Modified:
trunk/debathena/debathena/xsession/debian/changelog
trunk/debathena/debathena/xsession/debian/quotawarn
Log:
Change quotawarn to warn when 100M short of quota, instead of when at 90%.
Modified: trunk/debathena/debathena/xsession/debian/changelog
===================================================================
--- trunk/debathena/debathena/xsession/debian/changelog 2009-02-05 01:04:16 UTC (rev 23448)
+++ trunk/debathena/debathena/xsession/debian/changelog 2009-02-05 06:33:07 UTC (rev 23449)
@@ -1,9 +1,14 @@
debathena-xsession (1.5) unstable; urgency=low
+ [ William D Cattey ]
* Brought initial xterm code back in from Athena 9.
- -- William D Cattey <wdc@mit.edu> Wed, 04 Feb 2009 14:21:07 -0500
+ [ Evan Broder ]
+ * Warn when 100M short of quota, instead of when at 90%.
+ * tail +2 doesn't work on Debian systems anymore; use tail -n +2 instead.
+ -- Evan Broder <broder@mit.edu> Wed, 04 Feb 2009 20:24:25 -0500
+
debathena-xsession (1.4) unstable; urgency=low
* Remove DEB_AUTO_UPDATE_DEBIAN_CONTROL.
Modified: trunk/debathena/debathena/xsession/debian/quotawarn
===================================================================
--- trunk/debathena/debathena/xsession/debian/quotawarn 2009-02-05 01:04:16 UTC (rev 23448)
+++ trunk/debathena/debathena/xsession/debian/quotawarn 2009-02-05 06:33:07 UTC (rev 23449)
@@ -1,10 +1,14 @@
#!/bin/sh
+# Start warning when a usage is less than this many kilobytes away
+# from your quota
+tolerance=100000
+
# Determine the user's home directory usage and quota.
qline=`quota.debathena -v -f "$USER" | awk '/^\// {print}'`
usage=`echo "$qline" | awk '{print $2}'`
quota=`echo "$qline" | awk '{print $3}'`
-quota90=`expr "${quota:-0}" \* 9 / 10`
+warnlevel=`expr "${quota:-0}" - ${tolerance}`
if [ -n "$usage" -a -n "$quota" ] && [ "$usage" -ge "$quota" ]; then
zenity --error --text="
@@ -15,7 +19,7 @@
useful to identify unneeded files:
athrun consult helpquota"
-elif [ -n "$usage" -a -n "$quota90" ] && [ "$usage" -ge "$quota90" ]; then
+elif [ -n "$usage" -a -n "$warnlevel" ] && [ "$usage" -ge "$warnlevel" ]; then
zenity --info --text="
Your home directory usage is near your quota (${usage}KB
used out of ${quota}KB). Consider removing unneeded
@@ -26,12 +30,12 @@
fi
# Determine the user's mail usage and quota.
-qline=`mailquota | tail +2`
+qline=`mailquota | tail -n +2`
usage=`echo "$qline" | awk '{print $2}'`
quota=`echo "$qline" | awk '{print $3}'`
-quota90=`expr "${quota:-0}" \* 9 / 10`
+warnlevel=`expr "${quota:-0}" - ${tolerance}`
-if [ -n "$usage" -a -n "$quota90" ] && [ "$usage" -ge "$quota90" ]; then
+if [ -n "$usage" -a -n "$warnlevel" ] && [ "$usage" -ge "$warnlevel" ]; then
zenity --info --text="
Your MIT mail usage is close to or exceeding your mail
quota (${usage}KB used out of ${quota}KB). Consider
