fixed bug on splice3 associated with python2.7 interpreter

4 files changed, 9 insertions, 25 deletions

diff --git a/contrib/splice3/CHANGES b/contrib/splice3/CHANGES
index 20f1574..03d4d8a 100644
--- a/contrib/splice3/CHANGES
+++ b/contrib/splice3/CHANGES
@@ -50,3 +50,6 @@ CHANGES:
            added `make clean`.
 
            
+     Sat Sep 24 2011
+     d3v11 Changed Makefile and disabled py_compile
+           to avoid interpreter errors.
diff --git a/contrib/splice3/LINUX/splice3.compile b/contrib/splice3/LINUX/splice3.compile
deleted file mode 100755
index 11090b9..0000000
--- a/contrib/splice3/LINUX/splice3.compile
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/usr/bin/python2.7
-from py_compile import compile
-from sys import exit
-
-try:
-    compile('LINUX/splice3-deshadow.py', 'LINUX/splice3-deshadow.pyc')
-except:
-    print '***ERROR*** splice3: splice3-deshadow.py failed to compile :-('
-    exit('quitting...')
-
-try:
-    compile('LINUX/splice3.py', 'LINUX/splice3.pyc')
-except:
-    print '***ERROR*** splice3: splice3.py failed to compile'
-    exit('quitting...')
diff --git a/contrib/splice3/LINUX/splice3.py b/contrib/splice3/LINUX/splice3.py
index 16983a1..91443c2 100755
--- a/contrib/splice3/LINUX/splice3.py
+++ b/contrib/splice3/LINUX/splice3.py
@@ -479,7 +479,7 @@ if StdoutSwitch is True:
 if option.Create is False and RestoreSwitch is False:
  ShadowSwitch = option.DeShadow
  if ShadowSwitch is True:
-  option.cmd = "splice3-deshadow PASSWORD '" + ShadowSalt + "' '" + ShadowValue + "'"
+  option.cmd = "splice3-deshadow.py PASSWORD '" + ShadowSalt + "' '" + ShadowValue + "'"
  if option.cmd is None:
   print "splice3: error: invalid usage"
   sys.exit(1)
diff --git a/contrib/splice3/Makefile b/contrib/splice3/Makefile
index 4fcc9e6..78dbb71 100644
--- a/contrib/splice3/Makefile
+++ b/contrib/splice3/Makefile
@@ -9,15 +9,13 @@ install-deb:
 	mkdir DEBIAN/splice3/etc
 	mkdir DEBIAN/splice3/etc/splice3
 	cp DEBIAN/control DEBIAN/splice3/DEBIAN/control
-	./LINUX/splice3.compile
-	mv LINUX/splice3.pyc DEBIAN/splice3/usr/bin/splice3
-	mv LINUX/splice3-deshadow.pyc DEBIAN/splice3/usr/bin/splice3-deshadow
+	cp LINUX/splice3.py DEBIAN/splice3/usr/bin/splice3
+	cp LINUX/splice3-deshadow.py DEBIAN/splice3/usr/bin/splice3-deshadow
 	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
 	cp LINUX/manual DEBIAN/splice3/etc/splice3/splice3.1
 	gzip DEBIAN/splice3/etc/splice3/splice3.1
-	#cp SPLICE3/LICENSE DEBIAN/splice3/etc/splice3/LICENSE
 	cp SPLICE3/splice3.L DEBIAN/splice3/etc/splice3/splice3.L
 	cp SPLICE3/splice3.N DEBIAN/splice3/etc/splice3/splice3.N
 	cp SPLICE3/splice3.S DEBIAN/splice3/etc/splice3/splice3.S
@@ -32,9 +30,8 @@ install-deb:
 install:
 	make clean
 	make uninstall
-	./LINUX/splice3.compile
-	mv LINUX/splice3.pyc /usr/bin/splice3
-	mv LINUX/splice3-deshadow.pyc /usr/bin/splice3-deshadow
+	cp LINUX/splice3.py /usr/bin/splice3
+	cp LINUX/splice3-deshadow.py /usr/bin/splice3-deshadow
 	chmod +x /usr/bin/splice3
 	chmod +x /usr/bin/splice3-deshadow
 	mkdir /etc/splice3
@@ -48,7 +45,6 @@ install:
 	cp SPLICE3/splice3.LS /etc/splice3/splice3.LS
 	cp SPLICE3/splice3.NS /etc/splice3/splice3.NS
 	cp SPLICE3/splice3.LNS /etc/splice3/splice3.LNS
-	#cp SPLICE3/LICENSE /etc/splice3/LICENSE
 
 uninstall:
 	rm -rf /etc/splice3
@@ -68,5 +64,5 @@ update:
 	cat CHANGES
 
 clean:
-	rm */*.pyc DEBIAN/splice3 DEBIAN/*.deb -rf
+	rm DEBIAN/splice3 DEBIAN/*.deb -rf