# HG changeset patch
# User Nick <nick@somerandomnick.ano>
# Date 1325015109 0
# Node ID d7e331a9a1f8078ba4460fd323d1db3bbbfc10c9
# Parent  2fa4790fa684cbdf0262b82529608f383f5b025d# Parent  084fe9662481cb57ef52de0a5ea6b600d8e6c008
Merge commit '68d573ca1cc4d91b180a80807342beeca90b1ea1'

diff -r 084fe9662481 -r d7e331a9a1f8 contrib/peer2anonet/peer2anonet
--- a/contrib/peer2anonet/peer2anonet	Tue Dec 27 19:39:31 2011 +0000
+++ b/contrib/peer2anonet/peer2anonet	Tue Dec 27 19:45:09 2011 +0000
@@ -413,14 +413,14 @@
     )
 
     echo -e '\nCONFIGURE DNS:\n'
-    NICK=`cat conf/git_name`
-    TINYDNS_ROOT_IP=`cat conf/tinydns__rootsrvrip`
-    TINYDNS_ROOT_DOMAIN=`cat conf/tinydns__rootsrvrname`
-    TINYDNS_ANO_IP=`cat conf/tinydns__tldsrvrip`
-    TINYDNS_ANO_DOMAIN=`cat conf/tinydns__tldsrvrname`
-    TINYDNS_IP=`cat conf/tinydns__srvrip`
-    TINYDNS_DOMAIN=`cat conf/tinydns__srvrname`
-    GIT_IP=`cat conf/gitd_ip`
+    NICK=`cat conf/git_name` || exit 1
+    TINYDNS_ROOT_IP=`cat conf/tinydns__rootsrvrip` || exit 1
+    TINYDNS_ROOT_DOMAIN=`cat conf/tinydns__rootsrvrname` || exit 1
+    TINYDNS_ANO_IP=`cat conf/tinydns__tldsrvrip` || exit 1
+    TINYDNS_ANO_DOMAIN=`cat conf/tinydns__tldsrvrname` || exit 1
+    TINYDNS_IP=`cat conf/tinydns__srvrip` || exit 1
+    TINYDNS_DOMAIN=`cat conf/tinydns__srvrname` || exit 1
+    GIT_IP=`cat conf/gitd_ip` || exit 1
     GIT_DOMAIN="git.$NICK.ano"
 
     ip addr add $TINYDNS_ROOT_IP/32 dev lo > /dev/null 2>&1
diff -r 084fe9662481 -r d7e331a9a1f8 contrib/splicex/configure
--- a/contrib/splicex/configure	Tue Dec 27 19:39:31 2011 +0000
+++ b/contrib/splicex/configure	Tue Dec 27 19:45:09 2011 +0000
@@ -74,6 +74,7 @@
  fi
 fi
 echo
+mkdir -p build || exit 1
 if [ -z "$2" ]; then
  sed -e s^PYTHON^"$PYPATH"^g src/splicex.py >build/splicex || exit 1
  sed -e s^PYTHON^"$PYPATH"^g src/splicex-deshadow.py >build/splicex-deshadow || exit 1
diff -r 084fe9662481 -r d7e331a9a1f8 contrib/splicex/src/make.in
--- a/contrib/splicex/src/make.in	Tue Dec 27 19:39:31 2011 +0000
+++ b/contrib/splicex/src/make.in	Tue Dec 27 19:45:09 2011 +0000
@@ -61,7 +61,7 @@
 	rm  -f /usr/bin/splicex-deshadow
 
 clean:
-	rm Makefile DEBIAN/splicex DEBIAN/*.deb build/* -rf
+	rm Makefile DEBIAN/splicex DEBIAN/*.deb build -rf
 
 preinstall:
 	rm -rf /etc/splicex
diff -r 084fe9662481 -r d7e331a9a1f8 contrib/splicex/src/pymake.in
--- a/contrib/splicex/src/pymake.in	Tue Dec 27 19:39:31 2011 +0000
+++ b/contrib/splicex/src/pymake.in	Tue Dec 27 19:45:09 2011 +0000
@@ -48,7 +48,7 @@
 	rm  -f /usr/bin/splicex-deshadow
 
 clean:
-	rm Makefile DEBIAN/splicex DEBIAN/*.deb build/* -rf
+	rm Makefile DEBIAN/splicex DEBIAN/*.deb build -rf
 
 preinstall:
 	rm -rf /etc/splicex