From 52dc574f7a526661661255fc6e65640802609808 Mon Sep 17 00:00:00 2001
From: tv <tv@nomic.retiolum>
Date: Mon, 4 Nov 2013 16:37:40 +0100
Subject: cholerab brick installation: remove legacy code

---
 cholerab/tahoe/brick_installation | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'cholerab')

diff --git a/cholerab/tahoe/brick_installation b/cholerab/tahoe/brick_installation
index 1aedb52b..79748623 100644
--- a/cholerab/tahoe/brick_installation
+++ b/cholerab/tahoe/brick_installation
@@ -23,9 +23,8 @@ chown -R tahoe: /opt/tahoe
 
 # change nick name
 (echo -n "nick name [$HOSTNAME]: " &&
-    read name &&
-    { test "x$name" != x || name=$HOSTNAME; } &&
-    sed -i "s/^nickname =.*/nickname = $name/" /opt/tahoe/tahoe.cfg)
+    read nn &&
+    sed -i "s/^nickname =.*/nickname = ${nn:-$HOSTNAME}/" /opt/tahoe/tahoe.cfg)
 
 # replace introducer.furl = None with the one from pigstarter/tahoe/introducer.furl
 sed -i "s#^introducer\.furl.*#introducer.furl = $(curl pigstarter/tahoe/introducer.furl)#" /opt/tahoe/tahoe.cfg
-- 
cgit v1.2.3