mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-02-25 16:05:19 +00:00
50_Signalbot: Installer update to signal-cli 0.11.7
git-svn-id: https://svn.fhem.de/fhem/trunk@27381 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
5e3514873c
commit
f2a872cedf
@ -1,14 +1,14 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
#$Id:$
|
#$Id:$
|
||||||
SCRIPTVERSION="3.14"
|
SCRIPTVERSION="3.15"
|
||||||
# Author: Adimarantis
|
# Author: Adimarantis
|
||||||
# License: GPL
|
# License: GPL
|
||||||
#Install script for signal-cli
|
#Install script for signal-cli
|
||||||
SIGNALPATH=/opt
|
SIGNALPATH=/opt
|
||||||
SIGNALUSER=signal-cli
|
SIGNALUSER=signal-cli
|
||||||
LIBPATH=/usr/lib
|
LIBPATH=/usr/lib
|
||||||
SIGNALVERSION="0.11.4"
|
SIGNALVERSION="0.11.7"
|
||||||
LIBRARYVERSION="0.11.2" #Typically = SIGNALVERSION, but can be used if libsignal did not change
|
LIBRARYVERSION="0.22.0"
|
||||||
SIGNALVAR=/var/lib/$SIGNALUSER
|
SIGNALVAR=/var/lib/$SIGNALUSER
|
||||||
DBSYSTEMD=/etc/dbus-1/system.d
|
DBSYSTEMD=/etc/dbus-1/system.d
|
||||||
DBSYSTEMS=/usr/share/dbus-1/system-services
|
DBSYSTEMS=/usr/share/dbus-1/system-services
|
||||||
@ -171,14 +171,24 @@ if [ $ARCH = "armv7l" ]; then
|
|||||||
elif [ $ARCH = "x86_64" ]; then
|
elif [ $ARCH = "x86_64" ]; then
|
||||||
ARCH="amd64"
|
ARCH="amd64"
|
||||||
ARCHJ="x64"
|
ARCHJ="x64"
|
||||||
|
GLIBC="2.28" #should work with 2.31 as well
|
||||||
elif [ $ARCH = "aarch64" ]; then
|
elif [ $ARCH = "aarch64" ]; then
|
||||||
ARCH="aarch64"
|
BITS=`getconf LONG_BIT`
|
||||||
ARCHJ="aarch64"
|
if [ "$BITS" = "64" ]; then
|
||||||
GLIBC="2.28" #experimental
|
ARCH="aarch64"
|
||||||
|
ARCHJ="aarch64"
|
||||||
|
GLIBC="2.28" #experimental
|
||||||
|
SIGNALVERSION="0.11.2"
|
||||||
|
LIBRARYVERSION="0.11.2"
|
||||||
|
echo "64bit ARM (aarch64) currently only supported with signal-cli 0.11.2"
|
||||||
|
else
|
||||||
|
ARCH="armhf"
|
||||||
|
ARCHJ="arm"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
IDENTSTR=$ARCH-glibc$GLIBC-$LIBRARYVERSION
|
IDENTSTR=$ARCH-glibc$GLIBC-$LIBRARYVERSION
|
||||||
KNOWN=("amd64-glibc2.27-0.11.2" "amd64-glibc2.28-0.11.2" "amd64-glibc2.31-0.11.2" "armhf-glibc2.28-0.11.2" "armhf-glibc2.31-0.11.2" "aarch64-glibc2.28-0.11.2")
|
KNOWN=("amd64-glibc2.27-0.11.2" "amd64-glibc2.28-0.22.0" "armhf-glibc2.28-0.22.0" "armhf-glibc2.31-0.22.0" "aarch64-glibc2.28-0.11.2")
|
||||||
|
|
||||||
GETLIBS=1
|
GETLIBS=1
|
||||||
if [[ ! " ${KNOWN[*]} " =~ " ${IDENTSTR} " ]]; then
|
if [[ ! " ${KNOWN[*]} " =~ " ${IDENTSTR} " ]]; then
|
||||||
@ -209,7 +219,7 @@ echo "Please verify that these settings are correct:"
|
|||||||
echo "Signal-cli User: $SIGNALUSER"
|
echo "Signal-cli User: $SIGNALUSER"
|
||||||
echo "Signal-cli Install directory: $SIGNALPATH"
|
echo "Signal-cli Install directory: $SIGNALPATH"
|
||||||
echo "Signal config storage: $SIGNALVAR"
|
echo "Signal config storage: $SIGNALVAR"
|
||||||
echo "Signal version: $SIGNALVERSION"
|
echo "Signal version: $SIGNALVERSION (libsignal-client v$LIBRARYVERSION)"
|
||||||
echo "System library path: $LIBPATH"
|
echo "System library path: $LIBPATH"
|
||||||
echo "System architecture: $ARCH"
|
echo "System architecture: $ARCH"
|
||||||
echo "System GLIBC version: $GLIBC"
|
echo "System GLIBC version: $GLIBC"
|
||||||
@ -217,6 +227,13 @@ echo "Using Java version: $JAVACMD"
|
|||||||
echo "Native Java $JAVA_VERSION $JAVA_NATIVE (current version:$JVER)"
|
echo "Native Java $JAVA_VERSION $JAVA_NATIVE (current version:$JVER)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [ ! $(id -u) = 0 ] ; then
|
||||||
|
# the script needs to be executed with sudo (or root)
|
||||||
|
echo
|
||||||
|
echo "Please run $0 with sudo"
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
check_and_update() {
|
check_and_update() {
|
||||||
|
|
||||||
check_and_create_path $LIBPATH
|
check_and_create_path $LIBPATH
|
||||||
@ -631,7 +648,6 @@ if [ -z "$OPERATION" ] ; then
|
|||||||
echo "start : Start the signal-cli service (or respective docker processes)"
|
echo "start : Start the signal-cli service (or respective docker processes)"
|
||||||
echo "all : Run system, install, start and test (default)"
|
echo "all : Run system, install, start and test (default)"
|
||||||
echo
|
echo
|
||||||
echo "!!! Everything needs to run with sudo/root !!!"
|
|
||||||
OPERATION=all
|
OPERATION=all
|
||||||
else
|
else
|
||||||
echo "You chose the following option: $OPERATION"
|
echo "You chose the following option: $OPERATION"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user