From ad2af4722ce9088cac6604e499159b17d2387aff Mon Sep 17 00:00:00 2001
From: Ciro Santilli <ciro.santilli@savoirfairelinux.com>
Date: Fri, 29 Jan 2016 10:04:55 +0100
Subject: [PATCH] Revert back to shared library, create run and stop scripts

---
 .gitignore                    |  2 ++
 README.md                     | 13 ++++++-------
 clean-DATA-LOSS.sh            |  3 ++-
 client-android                |  2 +-
 lrc                           |  2 +-
 ubuntu-15.10-local-install.sh |  4 ++--
 ubuntu-15.10-run.sh           |  7 +++++++
 ubuntu-15.10-stop.sh          |  4 ++++
 8 files changed, 25 insertions(+), 12 deletions(-)
 create mode 100755 ubuntu-15.10-run.sh
 create mode 100755 ubuntu-15.10-stop.sh

diff --git a/.gitignore b/.gitignore
index 52294d93..e565c05a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+*.log
+*.pid
 /install
diff --git a/README.md b/README.md
index 87eee5ea..155f9ccc 100644
--- a/README.md
+++ b/README.md
@@ -8,15 +8,14 @@ I'd rather have a single Git repo, but without official support, maintaining a m
 
 ## Ubuntu 15.10
 
-Build, install locally under this repository, and run that local install:
+Build and install locally under this repository:
 
     ./ubuntu-15.10-local-install.sh
-    nohup ./install/daemon/libexec/dring >/dev/null &
-    DRING_PID=$!
-    ./install/client-gnome/bin/gnome-ring
 
-To stop, hit: `Ctrl + C` to kill the client and:
+Run daemon and client on background:
 
-    kill $DRING_PID
+    ./ubuntu-15.10-run.sh
 
-for the server.
+Stop daemon and client:
+
+    ./ubuntu-15.10-stop.sh
diff --git a/clean-DATA-LOSS.sh b/clean-DATA-LOSS.sh
index 2834269f..d473d06e 100755
--- a/clean-DATA-LOSS.sh
+++ b/clean-DATA-LOSS.sh
@@ -2,4 +2,5 @@
 # Remove everything that is not git tracked on the submodules.
 # May cause data loss.
 git submodule foreach git clean -dfx
-rm -rf install
+# sudo here because of: https://tuleap.ring.cx/plugins/tracker/?aid=301
+sudo rm -rf install *.log *.pid
diff --git a/client-android b/client-android
index ec528bb7..01dd7b25 160000
--- a/client-android
+++ b/client-android
@@ -1 +1 @@
-Subproject commit ec528bb70890b5c2808206416fac5c3fa3e91695
+Subproject commit 01dd7b25a5a6681df1c8053e14eb4b92aedb5fb5
diff --git a/lrc b/lrc
index a7ac2ddf..dcf6195e 160000
--- a/lrc
+++ b/lrc
@@ -1 +1 @@
-Subproject commit a7ac2ddfbe14a05bfed0f9220f17bef8cf8bcb29
+Subproject commit dcf6195e113c50ba5dac65fa99d2fe8211a55778
diff --git a/ubuntu-15.10-local-install.sh b/ubuntu-15.10-local-install.sh
index 63381025..2ce23f0f 100755
--- a/ubuntu-15.10-local-install.sh
+++ b/ubuntu-15.10-local-install.sh
@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+# Build and install to a local prefix under this repository.
+
 set -e
 
 sudo apt-get install \
@@ -73,7 +75,6 @@ cd build
 cmake .. \
   -DCMAKE_BUILD_TYPE=Debug \
   -DCMAKE_INSTALL_PREFIX="${INSTALL}/lrc" \
-  -DENABLE_STATIC=true \
   -DRING_BUILD_DIR="${RING}/src"
 make
 make install
@@ -83,7 +84,6 @@ mkdir -p build
 cd build
 cmake .. \
   -DCMAKE_INSTALL_PREFIX="${INSTALL}/client-gnome" \
-  -DENABLE_STATIC=true \
   -DLibRingClient_DIR="${INSTALL}/lrc/lib/cmake/LibRingClient"
 make
 sudo make install
diff --git a/ubuntu-15.10-run.sh b/ubuntu-15.10-run.sh
new file mode 100755
index 00000000..ecbf82ad
--- /dev/null
+++ b/ubuntu-15.10-run.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+# Run local install daemon and client that have\
+# been installed with the install script on the background.
+./install/daemon/libexec/dring 2>&1 >>daemon.log &
+echo $! >daemon.pid
+LD_LIBRARY_PATH="$LD_LIBRARY_PATH:install/lrc/lib" ./install/client-gnome/bin/gnome-ring 2>&1 >>client-gnome.log &
+echo $! >client-gnome.pid
diff --git a/ubuntu-15.10-stop.sh b/ubuntu-15.10-stop.sh
new file mode 100755
index 00000000..13604abc
--- /dev/null
+++ b/ubuntu-15.10-stop.sh
@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+# Stop local install daemon and client that have been installed with the install script.
+kill "$(cat client-gnome.pid)"
+kill "$(cat daemon.pid)"
-- 
GitLab