add readme, use apache license

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index d24964a6a21e9f27b13001be894831aa01d63ba6..ea99357c14cad178f563bc17641b76f139920e91 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -1,6 +1,18 @@
 #!/bin/bash -l
 # Copyright (C) 2016 Ian Kelling
-# This program is under GPL v. 3 or later, see <http://www.gnu.org/licenses/>
+
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+
+#     http://www.apache.org/licenses/LICENSE-2.0
+
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 errcatch
 
 set -x
@@ -203,10 +215,13 @@ if isdebian; then
     debian-setup-auto-update
 fi
 
+# we've got a few dependencies later on, so install them now.
+pi "${simple_packages[@]}"
+simple_packages=()
+
 case $HOSTNAME in
     lj|li)
 
-        pi "${simple_packages[@]}"
         case $HOSTNAME in
             lj) domain=iank.bid ;;
             li) domain=iankelling.org ;;
@@ -421,13 +436,13 @@ case $HOSTNAME in
                             exit 1
                         fi
                         ;;
-                esac
-                ;;
-            arch)
-                pi google-chrome
-                ;;
-        esac
-        ;;
+esac
+;;
+arch)
+    pi google-chrome
+    ;;
+esac
+;;
 esac
 
 # printer
@@ -668,6 +683,14 @@ esac
 # because no systemd user instance was running.
 # Doing systemd --user resulted in
 # Trying to run as user instance, but $XDG_RUNTIME_DIR is not set
+
+if isdebian-testing; then
+    # as of 7/2016, has no unstable deps, and is not in testing anymore.
+    pi synergy/unstable
+else
+    pi synergy
+fi
+
 case $distro in
     # ubuntu unknown. probably the same as debian, just check if the
     # init scripts come with the package.
@@ -697,9 +720,9 @@ Accept=false
 [Install]
 WantedBy=sockets.target
 EOF
+        systemctl --user daemon-reload
         ;;&
     *)
-        pi synergy
         # taken from arch wiki.
         s dd of=/etc/systemd/system/synergyc@.service <<'EOF'
 [Unit]
@@ -708,7 +731,7 @@ After=network.target
 
 [Service]
 User=%i
-ExecStart=/usr/bin/synergyc --no-daemon treetowl
+ExecStart=/usr/bin/synergyc --no-daemon frodo
 Restart=on-failure
 # per man systemd.unit, StartLimitInterval, by default we
 # restart more than 5 times in 10 seconds.
@@ -718,14 +741,16 @@ RestartSec=3s
 [Install]
 WantedBy=multi-user.target
 EOF
+        s systemctl daemon-reload
         case $HOSTNAME in
-            frodo)
+            x2|treetowl)
                 ser enable synergyc@ian
                 ser start synergyc@ian ||: # X might not be running yet
+                ;;
+            frodo)
                 systemctl --user start synergys ||:
                 systemctl --user enable synergys
                 ;;
-            treetowl) systemctl --user enable synergys ;;
         esac
         ;;
 esac