Skip to content
Snippets Groups Projects
Commit 31e7d733 authored by Rolf Niepraschk's avatar Rolf Niepraschk
Browse files

bump to "14.0.0"

parent 42e535c5
Branches
No related tags found
No related merge requests found
...@@ -5,9 +5,18 @@ ...@@ -5,9 +5,18 @@
R_PATH=/usr/local/share/relayServer/ # Path to relayServer installation R_PATH=/usr/local/share/relayServer/ # Path to relayServer installation
dist=$(lsb_release -is | cut -d " " -f 1 | tr '[A-Z]' '[a-z]')
case "$dist" in
opensuse)
chown -R nobody:nobody ${R_PATH} ;;
ubuntu|raspbian|debian)
chown -R nobody:nogroup ${R_PATH} ;;
esac
cd ${R_PATH} cd ${R_PATH}
ln -sf $PWD/vlLogging /usr/local/bin/vlLogging ln -sf $PWD/vlLogging /usr/local/bin/vlLogging
systemctl daemon-reload # if already exist systemctl daemon-reload # if already running
systemctl link $PWD/relayServer.service systemctl link $PWD/relayServer.service
systemctl restart relayServer.service systemctl restart relayServer.service
systemctl enable relayServer.service systemctl enable relayServer.service
......
{ {
"name": "relayServer", "name": "relayServer",
"version": "14.0.0-pre", "version": "14.0.0",
"description": "Nodejs-based http server for measurement tasks", "description": "Nodejs-based http server for measurement tasks",
"main": "relayServer.js", "main": "relayServer.js",
"directories": { "directories": {
......
...@@ -15,11 +15,12 @@ if false; then ...@@ -15,11 +15,12 @@ if false; then
fi fi
R_PATH=/usr/local/share/relayServer # Path to relayServer installation R_PATH=/usr/local/share/relayServer # Path to relayServer installation
TARGET_PATH=$(dirname $R_PATH)/
# $1=server, $2=source dir # $1=server, $2=source dir
function doIt { function doIt {
echo "Begin: ************** $1 **************" echo "Begin: ************** $1 **************"
echo "From: \"$2\" To: \"$R_PATH\"" echo "From: \"$2\" To: \"$1:$R_PATH\""
# »-L« – Treat symlinks on the source system like directories. # »-L« – Treat symlinks on the source system like directories.
# »--keep-dirlinks« – Treat symlinks on the target system like directories. # »--keep-dirlinks« – Treat symlinks on the target system like directories.
rsync --info=STATS1 -azL --delete --keep-dirlinks \ rsync --info=STATS1 -azL --delete --keep-dirlinks \
...@@ -29,33 +30,27 @@ function doIt { ...@@ -29,33 +30,27 @@ function doIt {
--exclude 'test' \ --exclude 'test' \
--exclude 'relayServer.spec' \ --exclude 'relayServer.spec' \
--exclude 'NOTIZEN' \ --exclude 'NOTIZEN' \
"$2" root@$1:$(dirname $R_PATH)/ "$2" root@$1:${TARGET_PATH}
# Rework on the target system # Rework on the target system
ssh root@$1 ${R_PATH}/install ssh root@$1 ${R_PATH}/install
echo "End: ************** $1 **************" echo "End: ************** $1 **************"
} }
if [[ $(basename $PWD) == "relayServer" ]]; then
source="$PWD"
else
echo "Error: You have to be in the relayServer directory"
exit 1
fi
# All computers must / should be accessible via ssh without a password! # All computers must / should be accessible via ssh without a password!
if [[ $1 ]]; then if [[ $1 ]]; then
server="$1" server="$1"
else else
server="localhost" server="localhost"
fi fi
for i in $server; do for i in $server; do
if [[ $i == 'localhost' || $i == '127.0.0.1' ]]; then
x=$(realpath -P "$PWD") ; y=$(realpath -P "$R_PATH")
# Test the correct source and prevent overwriting of $PWD.
if [[ $(basename $PWD) == "relayServer" && "$x" != "$y" ]]; then
source="$PWD"
else
echo "Fehler: Du musst Dich in einem relayServer-Verzeichnis befinden,"
echo " aber nicht in \"$R_PATH\" (ggf. Symlink weg)!"
exit 1
fi
else
source="$R_PATH"
fi
doIt $i "$source" doIt $i "$source"
done done
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment