[27103] in Source-Commits
/svn/athena r25948 - in trunk/athena/bin/gathrun: . debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Wed Apr 24 12:22:55 2013
Date: Wed, 24 Apr 2013 12:22:48 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201304241622.r3OGMm5r023804@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2013-04-24 12:22:48 -0400 (Wed, 24 Apr 2013)
New Revision: 25948
Modified:
trunk/athena/bin/gathrun/debian/changelog
trunk/athena/bin/gathrun/gathrun.sh
Log:
In gathrun:
* Add support for a splash screen to gathrun (Trac: #1208)
* Switch to zenity from gdialog
Modified: trunk/athena/bin/gathrun/debian/changelog
===================================================================
--- trunk/athena/bin/gathrun/debian/changelog 2013-04-24 15:28:49 UTC (rev 25947)
+++ trunk/athena/bin/gathrun/debian/changelog 2013-04-24 16:22:48 UTC (rev 25948)
@@ -1,10 +1,12 @@
-debathena-gathrun (10.1-0debathena2) UNRELEASED; urgency=low
+debathena-gathrun (10.1-0debathena2) unstable; urgency=low
* Switch from control.in to control (Trac: #561)
* Bump Standards-Version to 3.9.3
* Bump compat level to 7
+ * Add support for a splash screen to gathrun (Trac: #1208)
+ * Switch to zenity from gdialog
- -- Jonathan Reed <jdreed@mit.edu> Wed, 03 Apr 2013 13:59:42 -0400
+ -- Jonathan Reed <jdreed@mit.edu> Wed, 24 Apr 2013 12:08:45 -0400
debathena-gathrun (10.1-0debathena1) unstable; urgency=low
Modified: trunk/athena/bin/gathrun/gathrun.sh
===================================================================
--- trunk/athena/bin/gathrun/gathrun.sh 2013-04-24 15:28:49 UTC (rev 25947)
+++ trunk/athena/bin/gathrun/gathrun.sh 2013-04-24 16:22:48 UTC (rev 25948)
@@ -4,6 +4,12 @@
# gathrun - Run a program, or put up an error dialog saying that it
# doesn't exist.
+splash=no
+if [ "$1" = "--splash" ]; then
+ shift
+ splash=yes
+fi
+
# Set sane values
export ATHENA_SYS=${ATHENA_SYS:-$(machtype -S)}
export ATHENA_SYS_COMPAT=${ATHENA_SYS_COMPAT:-$(machtype -C)}
@@ -26,8 +32,11 @@
esac
if attachandrun --check "$locker" "$program" "$@"; then
+ if [ "$splash" = "yes" ]; then
+ yes | zenity --progress --text="Launching $program, please wait.\n(This may take a few moments)" --pulsate --no-cancel --timeout 7 &
+ fi
exec /bin/athena/attachandrun "$locker" "$program" "$program" "$@"
else
- gdialog --msgbox \
- "$program is not available in the $locker locker on this platform." 1 100
+ zenity --info \
+ --text="$program is not available in the $locker locker on this platform."
fi
