tsync with production - amprolla - devuan's apt repo merger
 (HTM) git clone git://parazyd.org/amprolla.git
 (DIR) Log
 (DIR) Files
 (DIR) Refs
 (DIR) README
 (DIR) LICENSE
       ---
 (DIR) commit ad0266535fd140ce675448424718ee607fffd092
 (DIR) parent aea67c63efac81f21a28464d044d3f012339c3c6
 (HTM) Author: parazyd <parazyd@dyne.org>
       Date:   Tue, 19 Dec 2017 02:07:14 +0100
       
       sync with production
       
       Diffstat:
         M orchestrate.sh                      |       4 ++--
       
       1 file changed, 2 insertions(+), 2 deletions(-)
       ---
 (DIR) diff --git a/orchestrate.sh b/orchestrate.sh
       t@@ -4,8 +4,8 @@
        # Orchestration of incremental updates
        
        # Make sure these correlate to lib/config.py
       -AMPROLLA_UPDATE="${AMPROLLA_UPDATE:-/srv/amprolla/amprolla_update.py}"
       -REPO_ROOT="${REPO_ROOT:-/srv/amprolla}"
       +AMPROLLA_UPDATE="${AMPROLLA_UPDATE:-/home/amprolla/amprolla/amprolla_update.py}"
       +REPO_ROOT="${REPO_ROOT:-/home/amprolla/amprolla}"
        
        [ -f "/run/lock/amprolla.lock" ] || {
        ln -snf "$REPO_ROOT"/merged-staging "$REPO_ROOT"/merged