From: Sebastien Douheret <sebastien.douheret@iot.bzh>
Date: Fri, 16 Jun 2017 14:32:41 +0000 (+0200)
Subject: Bump xds-agent and syncthing-inotify version
X-Git-Tag: 0.1.0~21
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?p=src%2Fxds%2Fxds-agent.git;a=commitdiff_plain;h=8810655f30bc31407999282c2e6e9ccf8423ffa7

Bump xds-agent and syncthing-inotify version
---

diff --git a/Makefile b/Makefile
index 90826c7..b844682 100644
--- a/Makefile
+++ b/Makefile
@@ -1,13 +1,11 @@
 # Makefile used to build XDS daemon Web Server
 
 # Application Version
-VERSION := 0.0.1
+VERSION := 0.1.0
 
 # Syncthing version to install
 SYNCTHING_VERSION = 0.14.28
-# FIXME: use patched version while waiting integration of #165
-#SYNCTHING_INOTIFY_VERSION = 0.8.5
-SYNCTHING_INOTIFY_VERSION = master
+SYNCTHING_INOTIFY_VERSION = 0.8.6
 
 
 
diff --git a/scripts/get-syncthing.sh b/scripts/get-syncthing.sh
index 4770d31..3455122 100755
--- a/scripts/get-syncthing.sh
+++ b/scripts/get-syncthing.sh
@@ -2,10 +2,10 @@
 
 # Configurable variables
 [ -z "$SYNCTHING_VERSION" ] && SYNCTHING_VERSION=0.14.28
-
-# FIXME: temporary HACK while waiting merge of #165
-#[ -z "$SYNCTHING_INOTIFY_VERSION" ] && SYNCTHING_INOTIFY_VERSION=0.8.5
-[ -z "$SYNCTHING_INOTIFY_VERSION" ] && { SYNCTHING_INOTIFY_VERSION=master; SYNCTHING_INOTIFY_CMID=af6fbf9d63f95a0; }
+[ -z "$SYNCTHING_INOTIFY_VERSION" ] && SYNCTHING_INOTIFY_VERSION=0.8.6
+# XXX - may be cleanup
+# Used as temporary HACK while waiting merge of #165
+#[ -z "$SYNCTHING_INOTIFY_VERSION" ] && { SYNCTHING_INOTIFY_VERSION=master; SYNCTHING_INOTIFY_CMID=af6fbf9d63f95a0; }
 [ -z "$DESTDIR" ] && DESTDIR=/usr/local/bin
 [ -z "$TMPDIR" ] && TMPDIR=/tmp
 [ -z "$GOOS" ] && GOOS=$(go env GOOS)
@@ -37,6 +37,12 @@ echo "Get Syncthing..."
 
 ## Install Syncthing + Syncthing-inotify
 ## gpg: key 00654A3E: public key "Syncthing Release Management <release@syncthing.net>" imported
+GPG=$(which gpg)
+if [ "$?" != 0 ]; then
+    echo "You must install first gpg ( eg.: sudo apt install gpg )"
+    exit 1
+fi
+
 gpg -q --keyserver pool.sks-keyservers.net --recv-keys 37C84554E7E0A261E4F76E1ED26E6ED000654A3E || exit 1
 
 tarball="syncthing-${GOOS_ST}-${GOARCH}-v${SYNCTHING_VERSION}.${TB_EXT}" \
@@ -59,12 +65,12 @@ if [ "$SYNCTHING_INOTIFY_VERSION" = "master" ]; then
     [[ ! -d ./syncthing ]] && (git clone https://github.com/syncthing/syncthing || exit 1; )
     [[ ! -d ./syncthing-inotify ]] && (git clone https://github.com/syncthing/syncthing-inotify || exit 1; )
     cd syncthing-inotify
+    git status
+    version=$(git describe --tags --always | sed 's/^v//')__patch_165
     if [ "$SYNCTHING_INOTIFY_CMID" != "" ]; then
         git checkout -q $SYNCTHING_INOTIFY_CMID || exit 1
+        version=${version}__patch_165
     fi
-    git status
-    export GOPATH=$(cd ../../../.. && pwd)
-    version=$(git describe --tags --always | sed 's/^v//')__patch_165
 
     # Workaround about "cannot find package "golang.org/x/sys/unix"
     go get -u golang.org/x/sys/unix
@@ -74,12 +80,13 @@ if [ "$SYNCTHING_INOTIFY_VERSION" = "master" ]; then
     OPTS=""
     [[ "$GOOS_STI" = "darwin" ]] && OPTS="-tags kqueue"
 
+    export GOPATH=$(cd ../../../.. && pwd)
     go build ${OPTS} -v -i -ldflags "-w -X main.Version=$version" -o ${DESTDIR}/syncthing-inotify${EXT} || exit 1
 else
 
     tarball="syncthing-inotify-${GOOS_STI}-${GOARCH}-v${SYNCTHING_INOTIFY_VERSION}.${TB_EXT}"
     curl -sfSL "https://github.com/syncthing/syncthing-inotify/releases/download/v${SYNCTHING_INOTIFY_VERSION}/${tarball}" -O || exit 1
-	rm -rf syncthing-inotify-${GOOS_STI}-${GOARCH}-v${SYNCTHING_INOTIFY_VERSION}
+    rm -rf syncthing-inotify-${GOOS_STI}-${GOARCH}-v${SYNCTHING_INOTIFY_VERSION}
     if [ "${TB_EXT}" = "tar.gz" ]; then
         tar -xvf "${tarball}" syncthing-inotify && mv syncthing-inotify ${DESTDIR}/syncthing-inotify || exit 1
     else