From a886763023165ec84ecdf978be890d8bdd95304f Mon Sep 17 00:00:00 2001
From: Ian Kelling <iank@fsf.org>
Date: Tue, 24 Oct 2017 00:02:08 -0400
Subject: [PATCH] various fixes

---
 demohost-mount |  6 +++---
 distro-end     |  4 ++--
 rew            | 11 +++++++++--
 3 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/demohost-mount b/demohost-mount
index 6445187..8dc0620 100755
--- a/demohost-mount
+++ b/demohost-mount
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 set -eE -o pipefail
 trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
@@ -9,11 +9,11 @@ trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?" >&2' ERR
 
 
 ip=$(host demohost | sed -rn 's/^\S+ has address //p;T;q')/32
-cedit demohost /etc/exports <<EOF
+cedit demohost /etc/exports <<EOF || exportfs -ra
 /a $ip(async,rw,no_subtree_check,no_root_squash)
 /q $ip(async,rw,no_subtree_check,no_root_squash)
 EOF
-exportfs -ra
+
 
 ssh root@demohost bash -s <<'EOFOUTER'
 set -eE -o pipefail
diff --git a/distro-end b/distro-end
index b044f5c..5a7dd92 100755
--- a/distro-end
+++ b/distro-end
@@ -193,7 +193,7 @@ esac
 
 
 case $distro in
-    debian) pi curl;;
+    debian|trisquel|ubuntu) pi curl;;
     arch) : ;;
     # fedora: unknown
 esac
@@ -1344,7 +1344,7 @@ esac
 
 case $distro in
     debian)
-        pi task-cinnamon-desktop
+        pi task-mate-desktop
         # in settings, change scrolling to two-finger,
         # because the default edge scroll doesn\'t work.
         pu transmission-gtk
diff --git a/rew b/rew
index ee1aaf4..2ce3a66 100755
--- a/rew
+++ b/rew
@@ -11,10 +11,17 @@ fi
 # so we don't hold open the /a fs
 sudo rsync -r --delete /a/opt/gnirehtet /opt
 cd /opt/gnirehtet
-./gnirehtet rt &>/tmp/rt &
+
+# just running it in foreground so it's easier to kill etc.
+./gnirehtet rt
+
+
 # note, to kill it, you need to also kill
 # lsof -i tcp:31416
 # and maybe unplug adb cable
 # note, ping results in log message: dropping invalid packet
 
-tail -F /tmp/rt ||:
+
+#./gnirehtet rt &>/tmp/rt &
+
+#tail -F /tmp/rt ||:
-- 
2.30.2