From a8abfcd05b5518ddacf5ccdf86bfff6528784eea Mon Sep 17 00:00:00 2001
From: makefu <github@syntax-fehler.de>
Date: Thu, 7 Nov 2013 17:12:26 +0100
Subject: ship: fix tor build

---
 ship/src/tor | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ship/src/tor b/ship/src/tor
index fa0c929f..df904444 100755
--- a/ship/src/tor
+++ b/ship/src/tor
@@ -1,7 +1,7 @@
 #!/bin/sh
 #@include core
-
-
+#@include network
+#@include punani
 # can be set via env:
 # torrc              - path to torrc (default: /etc/tor/torrc )
 # hidden_service_dir - path to hidden service (default: /var/lib/tor/hidden_service/ )
@@ -9,7 +9,9 @@
 torrc=${torrc:-/etc/tor/torrc}
 hidden_service_dir=${hidden_service_dir:-/var/lib/tor/hidden_service/}
 
-test -w "$torrc" || ( error "$torrc is not writable!"; exit 1 )
+punani install tor
+
+test -w "$torrc" || ( error "$torrc is not writable!"; exit 1 ) || exit 1
 if ! grep -q '^HiddenService' "$torrc"  ;then
     info "adding hidden service to $torrc"
     cat >> "$torrc" << EOF
-- 
cgit v1.2.3