From 165bc589fdb5e8d3dd03f2e6030172629eb07ded Mon Sep 17 00:00:00 2001 From: Adam Ierymenko Date: Fri, 8 Nov 2013 17:37:47 -0500 Subject: Linux install and uninstall seem to work. --- installer/linux/init.d/zerotier-one | 2 +- installer/linux/uninstall.sh | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) (limited to 'installer/linux') diff --git a/installer/linux/init.d/zerotier-one b/installer/linux/init.d/zerotier-one index 4c8c5038..fdb8522a 100755 --- a/installer/linux/init.d/zerotier-one +++ b/installer/linux/init.d/zerotier-one @@ -56,7 +56,7 @@ fi case "$1" in start) - if [ $running -eq 0 ]; then + if [ $running -gt 0 ]; then echo "ZeroTier One already running." exit 0 fi diff --git a/installer/linux/uninstall.sh b/installer/linux/uninstall.sh index 1a8fe34c..292ac22f 100755 --- a/installer/linux/uninstall.sh +++ b/installer/linux/uninstall.sh @@ -9,7 +9,7 @@ fi echo -echo "Going to uninstall zerotier-one, hit CTRL+C to abort." +echo "This will uninstall ZeroTier One, hit CTRL+C to abort." echo "Waiting 5 seconds..." sleep 5 @@ -18,14 +18,17 @@ killall -q -TERM zerotier-one sleep 2 killall -q -KILL zerotier-one +echo "Removing SysV init items..." +rm -fv /etc/init.d/zerotier-one +find /etc/rc*.d -name '???zerotier-one' -print0 | xargs -0 rm -fv + echo "Erasing binary and support files..." cd /var/lib/zerotier-one -rm -fv zerotier-one *.persist authtoken.secret identity.public *.log +rm -fv zerotier-one *.persist authtoken.secret identity.public *.log *.pid rm -rfv updates.d networks.d iddb.d -echo "Removing init items..." -rm -fv /etc/init.d/zerotier-one -find /etc/rc*.d -name '???zerotier-one' -print0 | xargs -0 rm -fv +echo "Erasing anything installed into system bin directories..." +rm -fv /usr/local/bin/zerotier-* /usr/bin/zerotier-* echo "Done." echo -- cgit v1.2.3