[26707] in Source-Commits
/svn/athena r25703 - trunk/debathena/debathena/locker-menu/debian
daemon@ATHENA.MIT.EDU (Jonathan D Reed)
Mon Aug 6 09:12:40 2012
Date: Mon, 6 Aug 2012 09:12:38 -0400
From: Jonathan D Reed <jdreed@MIT.EDU>
Message-Id: <201208061312.q76DCcLQ026287@drugstore.mit.edu>
To: source-commits@MIT.EDU
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: jdreed
Date: 2012-08-06 09:12:38 -0400 (Mon, 06 Aug 2012)
New Revision: 25703
Modified:
trunk/debathena/debathena/locker-menu/debian/changelog
trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.postinst
Log:
In locker-menu:
* Use correct logic in postinst to determine if link was successful.
Modified: trunk/debathena/debathena/locker-menu/debian/changelog
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/changelog 2012-08-04 17:06:07 UTC (rev 25702)
+++ trunk/debathena/debathena/locker-menu/debian/changelog 2012-08-06 13:12:38 UTC (rev 25703)
@@ -1,3 +1,9 @@
+debathena-locker-menu (1.9) unstable; urgency=low
+
+ * Use correct logic in postinst to determine if link was successful.
+
+ -- Jonathan Reed <jdreed@mit.edu> Mon, 06 Aug 2012 09:12:06 -0400
+
debathena-locker-menu (1.8) unstable; urgency=low
* Add shiny icons (Trac: #581)
Modified: trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.postinst
===================================================================
--- trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.postinst 2012-08-04 17:06:07 UTC (rev 25702)
+++ trunk/debathena/debathena/locker-menu/debian/debathena-locker-menu.postinst 2012-08-06 13:12:38 UTC (rev 25703)
@@ -31,8 +31,8 @@
if [ "$RET" = "true" ]; then
echo "Using real icons for debathena-locker-menu..." >&2
for i in $ICONS; do
- if [ -f "$ICON_NONFREE_DIR/$i" ] && \
- ln -nsf "$ICON_NONFREE_DIR/$i" "$SHAREDIR/$i"; then
+ if ! [ -f "$ICON_NONFREE_DIR/$i" ] || \
+ ! ln -nsf "$ICON_NONFREE_DIR/$i" "$SHAREDIR/$i"; then
echo "Can't find or link real icon for $i, falling back to generic" >&2
ln -nsf "$SHAREDIR/generic-icon.png" "$SHAREDIR/$i"
fi
