diff options
| -rw-r--r-- | contrib/splice3/CHANGES | 5 | ||||
| -rwxr-xr-x | contrib/splice3/LINUX/splice3-deshadow.py | 2 | ||||
| -rwxr-xr-x | contrib/splice3/LINUX/splice3.py | 2 | ||||
| -rw-r--r-- | contrib/splice3/Makefile | 20 | ||||
| -rw-r--r-- | contrib/splice3/README | 2 | ||||
| -rwxr-xr-x | contrib/splice3/setup | 21 | ||||
| -rwxr-xr-x | contrib/splice3/setup-deb | 29 |
7 files changed, 66 insertions, 15 deletions
diff --git a/contrib/splice3/CHANGES b/contrib/splice3/CHANGES index 03d4d8a..296e07f 100644 --- a/contrib/splice3/CHANGES +++ b/contrib/splice3/CHANGES @@ -53,3 +53,8 @@ CHANGES: Sat Sep 24 2011 d3v11 Changed Makefile and disabled py_compile to avoid interpreter errors. + + Sat Oct 1 2011 + d3v11 added setup and setup-deb with Makefile + to check for dependencies and set the + correct environment paths. diff --git a/contrib/splice3/LINUX/splice3-deshadow.py b/contrib/splice3/LINUX/splice3-deshadow.py index a2a3edf..7d08d75 100755 --- a/contrib/splice3/LINUX/splice3-deshadow.py +++ b/contrib/splice3/LINUX/splice3-deshadow.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.7 +#!PYTHON import sys; sys.tracebacklimit = 0 from crypt import crypt TestHash = crypt(sys.argv[1], sys.argv[2]) diff --git a/contrib/splice3/LINUX/splice3.py b/contrib/splice3/LINUX/splice3.py index 91443c2..e58e955 100755 --- a/contrib/splice3/LINUX/splice3.py +++ b/contrib/splice3/LINUX/splice3.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.7 +#!PYTHON import os import re diff --git a/contrib/splice3/Makefile b/contrib/splice3/Makefile index 78dbb71..5f0c9fe 100644 --- a/contrib/splice3/Makefile +++ b/contrib/splice3/Makefile @@ -2,6 +2,7 @@ install-deb: make clean + ./setup-deb mkdir DEBIAN/splice3 mkdir DEBIAN/splice3/DEBIAN mkdir DEBIAN/splice3/usr @@ -9,8 +10,9 @@ install-deb: mkdir DEBIAN/splice3/etc mkdir DEBIAN/splice3/etc/splice3 cp DEBIAN/control DEBIAN/splice3/DEBIAN/control - cp LINUX/splice3.py DEBIAN/splice3/usr/bin/splice3 - cp LINUX/splice3-deshadow.py DEBIAN/splice3/usr/bin/splice3-deshadow + cp LINUX/splice3.cp DEBIAN/splice3/usr/bin/splice3 + cp LINUX/splice3-deshadow.cp DEBIAN/splice3/usr/bin/splice3-deshadow + rm -rf LINUX/*.cp chmod +x DEBIAN/splice3/usr/bin/splice3 chmod +x DEBIAN/splice3/usr/bin/splice3-deshadow cp SPLICE3/splice3.list DEBIAN/splice3/etc/splice3/splice3.list @@ -29,9 +31,11 @@ install-deb: install: make clean + ./setup make uninstall - cp LINUX/splice3.py /usr/bin/splice3 - cp LINUX/splice3-deshadow.py /usr/bin/splice3-deshadow + cp LINUX/splice3.cp /usr/bin/splice3 + cp LINUX/splice3-deshadow.cp /usr/bin/splice3-deshadow + rm -rf LINUX/*.cp chmod +x /usr/bin/splice3 chmod +x /usr/bin/splice3-deshadow mkdir /etc/splice3 @@ -51,18 +55,10 @@ uninstall: rm -f /usr/bin/splice3 rm -f /usr/bin/splice3-deshadow -update-tor: - usewithtor wget http://nbafkr7odek2wh6r.onion/splice3.tgz -O ../splice3.tgz - tar -xvf ../splice3.tgz --directory='../' - rm ../splice3.tgz - cat CHANGES - update: wget http://www.d3v11.ano/splice3.tgz -O ../splice3.tgz tar -xvf ../splice3.tgz --directory='../' rm ../splice3.tgz - cat CHANGES clean: rm DEBIAN/splice3 DEBIAN/*.deb -rf - diff --git a/contrib/splice3/README b/contrib/splice3/README index 694efe7..d79a699 100644 --- a/contrib/splice3/README +++ b/contrib/splice3/README @@ -27,7 +27,7 @@ LICENSE: along with this program. If not, see <http://www.gnu.org/licenses/>. DEPENDS ON: - python2.7 + python2.7, man INSTALL AND UNINSTALL: To install, `cd' to the extracted splice folder. diff --git a/contrib/splice3/setup b/contrib/splice3/setup new file mode 100755 index 0000000..109f9d4 --- /dev/null +++ b/contrib/splice3/setup @@ -0,0 +1,21 @@ +#!/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 + : +else + echo 'man not found. Quiting... :-(' + exit 1 +fi + +echo 'configuring path to python2.7' +PYPATH=`which python2.7` +sed -e s^PYTHON^"$PYPATH"^g LINUX/splice3.py >LINUX/splice3.cp +sed -e s^PYTHON^"$PYPATH"^g LINUX/splice3-deshadow.py >LINUX/splice3-deshadow.cp diff --git a/contrib/splice3/setup-deb b/contrib/splice3/setup-deb new file mode 100755 index 0000000..c9e3046 --- /dev/null +++ b/contrib/splice3/setup-deb @@ -0,0 +1,29 @@ +#!/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 + : +else + echo 'man not found. Quiting... :-(' + exit 1 +fi + +echo 'checking for dpkg' +if which dpkg >/dev/null; then + : +else + echo 'dpkg not found. Quiting... :-(' + exit 1 +fi + +echo 'configuring path to python2.7' +PYPATH=`which python2.7` +sed -e s^PYTHON^"$PYPATH"^g LINUX/splice3.py >LINUX/splice3.cp +sed -e s^PYTHON^"$PYPATH"^g LINUX/splice3-deshadow.py >LINUX/splice3-deshadow.cp |