blob: c1db35d9013dd64d837ccb2630cfdf71d24899c8 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
|
molmol | 65 +++++++++--------------------------------------------------------
1 file changed, 9 insertions(+), 56 deletions(-)
diff --git a/molmol b/molmol
index 7863225..b6c75ce 100755
--- a/molmol
+++ b/molmol
@@ -11,55 +11,8 @@ ostype=`uname`
osrel=`uname -r`
osmaj=`echo $osrel | awk -F. '{print $1}'`
osmin=`echo $osrel | awk -F. '{print $2}'`
-localdev=
-glxdev=
-
-if [ $ostype = "IRIX" -o $ostype = "IRIX64" ]; then
- if [ $osmaj -eq 6 -a $osmin -ge 2 -o $osmaj -gt 6 ]; then
- arch=sgi6
- localdev=Motif/OpenGL
- glxdev=Motif/OpenGL
- elif [ $osmaj -eq 5 -a $osmin -ge 3 -o $osmaj -gt 5 ]; then
- arch=sgi5
- localdev=Motif/OpenGL
- glxdev=Motif/OpenGL
- else
- arch=sgi4
- localdev=Motif/GL
- fi
- MONITOR=72HZ; export MONITOR
-elif [ $ostype = "AIX" ]; then
- arch=aix
- localdev=Motif/OpenGL
-elif [ $ostype = "HP-UX" ]; then
- arch=hp
- localdev=Motif/OpenGL
- glxdev=Motif/OpenGL
-elif [ $ostype = "OSF1" ]; then
- arch=dec
- localdev=Motif/OpenGL
-elif [ $ostype = "Linux" ]; then
- arch=lnx
- localdev=Motif/OpenGL
-elif [ $ostype = "SunOS" ]; then
- if [ $osmaj -eq 5 -a $osmin -ge 4 -o $osmaj -gt 5 ]; then
- arch=sol
- localdev=Motif/OpenGL
- else
- arch=sun
- fi
-else
- arch=unknown
-fi
-
-if [ $ostype = "SunOS" ]; then
- xdpy=/usr/openwin/bin/xdpyinfo
-elif [ $ostype = "HP-UX" ]; then
- xdpy=/usr/contrib/bin/X11/xdpyinfo
-else
- xdpy=/usr/bin/X11/xdpyinfo
-fi
-
+localdev=Motif/OpenGL
+glxdev=Motif/OpenGL
printUsage () {
echo "Usage: molmol -ht2as [-o dev] [-r range] [-f macro] files"
echo ""
@@ -121,15 +74,15 @@ done
magictmp=/tmp/molmol_magic$$
-if [ ! -d $HOME/molmol ]; then
- mkdir $HOME/molmol
+if [ ! -d $HOME/.molmol ]; then
+ mkdir $HOME/.molmol
fi
-startmacro=$HOME/molmol/options.mac
+startmacro=$HOME/.molmol/options.mac
cp /dev/null $startmacro
if [ -n "$*" ]; then
- if [ -f $HOME/molmol/dump ]; then
- mv -f $HOME/molmol/dump $HOME/molmol/dump.old
+ if [ -f $HOME/.molmol/dump ]; then
+ mv -f $HOME/.molmol/dump $HOME/.molmol/dump.old
fi
echo "0 long 0x3b7a12f9 MOLMOL" > $magictmp
echo "0 long 0xf9127a3b MOLMOL" >> $magictmp
@@ -209,7 +162,7 @@ elif [ -x $xdpy ]; then
fi
if [ "$input" = "-" -o -n "$nograph" ]; then
- $MOLMOLHOME/molmol.$arch $xopt
+ $MOLMOLHOME/molmol $xopt
else
- $MOLMOLHOME/molmol.$arch $xopt < /dev/null
+ $MOLMOLHOME/molmol $xopt < /dev/null
fi
|
GitWeb