summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authord3v11 <d3v11@d3v11.ano>2011-10-08 15:38:32 -0500
committerd3v11 <d3v11@d3v11.ano>2011-10-08 15:38:32 -0500
commit97d218e7dfea5cced35fef8830b724bcd97f0bcf (patch)
tree9104c9d63546930916e440d042f0e225e0267e9c
parent4bbdbed4c6a6afbd51c57116a2390e3a1af5edd1 (diff)
downloadresdb-97d218e7dfea5cced35fef8830b724bcd97f0bcf.tar.gz
resdb-97d218e7dfea5cced35fef8830b724bcd97f0bcf.zip
contrib/splice3 changes made
-rw-r--r--contrib/splice3/CHANGES3
-rwxr-xr-xcontrib/splice3/setup-deb19
2 files changed, 15 insertions, 7 deletions
diff --git a/contrib/splice3/CHANGES b/contrib/splice3/CHANGES
index c7f8087..dffac62 100644
--- a/contrib/splice3/CHANGES
+++ b/contrib/splice3/CHANGES
@@ -68,3 +68,6 @@ CHANGES:
d3v11 updated save/restore features for new
newest modules. changed --se-create
to function as a module.
+
+ fixed setup-deb bug with dependency
+ checks.
diff --git a/contrib/splice3/setup-deb b/contrib/splice3/setup-deb
index c9e3046..bf8dd01 100755
--- a/contrib/splice3/setup-deb
+++ b/contrib/splice3/setup-deb
@@ -1,11 +1,4 @@
#!/bin/bash
-echo 'checking for python2.7'
-if which python2.7 >/dev/null; then
- :
-else
- echo 'python2.7 not found. Quiting... :-('
- exit 1
-fi
echo 'checking for man'
if which man >/dev/null; then
@@ -23,6 +16,18 @@ else
exit 1
fi
+echo 'checking for python2.7'
+CheckPython=`dpkg --get-selections python2.7`
+if [[ $CheckPython == *deinstall* ]]; then
+ echo 'python2.7 not found. Quiting... :-('
+ exit 1
+elif [[ $CheckPython == '' ]]; then
+ echo 'python2.7 not found. Quiting... :-('
+ exit 1
+else
+ :
+fi
+
echo 'configuring path to python2.7'
PYPATH=`which python2.7`
sed -e s^PYTHON^"$PYPATH"^g LINUX/splice3.py >LINUX/splice3.cp