summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDonnie Berkholz <dberkholz@gentoo.org>2005-12-15 15:48:34 +0000
committerDonnie Berkholz <dberkholz@gentoo.org>2005-12-15 15:48:34 +0000
commitc8d3c751378f179225fc62a7821c00ab8cdf6b49 (patch)
tree63465c8278ce5138e8652c9d0c4c6fbefb7f61a1 /sci-chemistry/rasmol/files
parent-* ~x86 (diff)
downloadhistorical-c8d3c751378f179225fc62a7821c00ab8cdf6b49.tar.gz
historical-c8d3c751378f179225fc62a7821c00ab8cdf6b49.tar.bz2
historical-c8d3c751378f179225fc62a7821c00ab8cdf6b49.zip
Update rasmol script to fall back to xdpyinfo if xwininfo isn't available. Depend on one of the two.
Package-Manager: portage-2.0.53
Diffstat (limited to 'sci-chemistry/rasmol/files')
-rw-r--r--sci-chemistry/rasmol/files/digest-rasmol-2.7.2.1.1-r11
-rw-r--r--sci-chemistry/rasmol/files/rasmol.sh.debian6
2 files changed, 5 insertions, 2 deletions
diff --git a/sci-chemistry/rasmol/files/digest-rasmol-2.7.2.1.1-r1 b/sci-chemistry/rasmol/files/digest-rasmol-2.7.2.1.1-r1
new file mode 100644
index 000000000000..eb182a808893
--- /dev/null
+++ b/sci-chemistry/rasmol/files/digest-rasmol-2.7.2.1.1-r1
@@ -0,0 +1 @@
+MD5 6acb3e808c32333697d28675414abce2 RasMol_2.7.2.1.1.tar.gz 4892830
diff --git a/sci-chemistry/rasmol/files/rasmol.sh.debian b/sci-chemistry/rasmol/files/rasmol.sh.debian
index e86da961a295..e559e902267b 100644
--- a/sci-chemistry/rasmol/files/rasmol.sh.debian
+++ b/sci-chemistry/rasmol/files/rasmol.sh.debian
@@ -15,8 +15,10 @@ export RASMOLPATH
RASMOL_VISUAL=8
-if [ -e /usr/bin/X11/xwininfo ]; then
+if [ -e /usr/bin/xwininfo ]; then
RASMOL_VISUAL=`xwininfo -root | perl -ne 'chomp;print if s|\s+Depth:\s+||'` ;
+elif [ -e /usr/bin/xdpyinfo ]; then
+ RASMOL_VISUAL=` xdpyinfo | perl -ne 'chomp;print if s|\s+depth of root window:\s+(.*)\splanes|\1|'` ;
fi
if [ -e "/etc/rasmol/.rasmol.conf" ]; then
@@ -47,4 +49,4 @@ if [ $RASMOL_VISUAL == 24 ]; then
RASMOL_VISUAL=32;
fi
-$RASMOLPATH/rasmol.$RASMOL_VISUAL $* \ No newline at end of file
+$RASMOLPATH/rasmol.$RASMOL_VISUAL $*