From cbe1175a95aed906863702be904ed6f0c0ab3016 Mon Sep 17 00:00:00 2001
From: poka <poka@p2p.legal>
Date: Thu, 19 Mar 2020 22:21:19 +0100
Subject: [PATCH] fix install stuff

---
 .install/ipfs.sh        |  1 +
 .install/scuttlebutt.sh |  2 ++
 install.sh              | 23 +----------------------
 3 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/.install/ipfs.sh b/.install/ipfs.sh
index 7967e4f..e854161 100755
--- a/.install/ipfs.sh
+++ b/.install/ipfs.sh
@@ -27,3 +27,4 @@ ipfs() {
         sudo systemctl enable ipfs || err+="Enable IPFS daemon"
 }
 
+$@
diff --git a/.install/scuttlebutt.sh b/.install/scuttlebutt.sh
index de4717d..7ae3c1e 100755
--- a/.install/scuttlebutt.sh
+++ b/.install/scuttlebutt.sh
@@ -3,3 +3,5 @@
 scuttlebutt() {
 	echo "TODO"
 }
+
+$@
diff --git a/install.sh b/install.sh
index a570a20..6a41502 100755
--- a/install.sh
+++ b/install.sh
@@ -63,28 +63,7 @@ iptubes() {
 }
 
 # Install Torrengo
-torrengo() {
-	cd $MY_PATH/iptubes
-	## Install GO
-	wget https://dl.google.com/go/go1.13.4.linux-amd64.tar.gz -P /tmp/
-	sudo tar -C /usr/local -xzf /tmp/go1.13.4.linux-amd64.tar.gz
-	export PATH=$PATH:/usr/local/go/bin
-	source ~/.profile
-
-	## Install torrengo
-	go get github.com/juliensalinas/torrengo
-	go build github.com/juliensalinas/torrengo
-	go get github.com/juliensalinas/torrengo/ygg
-
-	sudo chmod ug+x torrengo
-	pathTorrengo=$(realpath torrengo)
-	cd /usr/bin
-	sudo ln -sf $pathTorrengo .
-
-
-	cd $MY_PATH
-	rm /tmp/go1.13.4.linux-amd64.tar.gz
-}
+	source iptubes/install.sh torrengo
 
 # --------------------------