Permalink
Browse files

Update the zephyr3/zephyr4 hack from the locker

Though we may not be needing it soon.
  • Loading branch information...
1 parent c6a69a6 commit 25601e0fe17f70da02cfb05aafb8f8d5107aacf9 @davidben committed Sep 14, 2012
Showing with 12 additions and 4 deletions.
  1. +12 −4 barnowl
View
@@ -19,12 +19,20 @@ esac
# Detect zephyr name if necessary
if [ ! -x "$BARNOWL_REAL_PATH" ]; then
- if test -x /sbin/ldconfig && /sbin/ldconfig -p | grep -qF "libzephyr.so.4"; then
- ZEPHYR_SONAME=zephyr4
+ SUFFIX=
+
+ # Both Debian Lenny and Ubuntu Karmic use the _deb50
+ # sysname, but they have different zephyr versions (soname
+ # 3 and 4, respectively). So for that sysname, we the
+ # build script includes the zephyr soname into the binary
+ # name, and we pick the right one.
+ if /sbin/ldconfig -p | grep -qF "libzephyr.so.4"; then
+ SUFFIX=.zephyr4
else
- ZEPHYR_SONAME=zephyr3
+ SUFFIX=.zephyr3
fi
- BARNOWL_REAL_PATH="$BARNOWL_REAL_PATH.$ZEPHYR_SONAME"
+
+ BARNOWL_REAL_PATH="$BARNOWL_REAL_PATH$SUFFIX"
fi
exec "$BARNOWL_REAL_PATH" "$@"

0 comments on commit 25601e0

Please sign in to comment.