FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-02-25 16:05:19 +00:00
Code Issues Releases Wiki Activity

50_Signalbot: Installer update signal-cli 0.11.3

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@26496 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Adimarantis 2022-10-07 17:19:06 +00:00
parent c2b92f6fb9
commit baa770972d
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/contrib/signal/signal_install.sh
View File

@ -1,20 +1,21 @@
#!/bin/bash #!/bin/bash
#$Id:$ #$Id:$
SCRIPTVERSION="3.10" SCRIPTVERSION="3.11"
# 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.2" SIGNALVERSION="0.11.3"
LIBRARYVERSION="0.11.2" #Typically = SIGNALVERSION, but can be used if libsignal did not change
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
SYSTEMD=/etc/systemd/system SYSTEMD=/etc/systemd/system
LOG=/tmp/signal_install.log LOG=/tmp/signal_install.log
TMPFILE=/tmp/signal$$.tmp TMPFILE=/tmp/signal$$.tmp
DBVER=0.19 DBVER=0.22
OPERATION=$1 OPERATION=$1
JAVACMD=java JAVACMD=java
@ -170,7 +171,7 @@ elif [ $ARCH = "x86_64" ]; then
fi fi
GLIBC=`ldd --version | grep -m1 -o '[0-9]\.[0-9][0-9]' | head -n 1` GLIBC=`ldd --version | grep -m1 -o '[0-9]\.[0-9][0-9]' | head -n 1`
IDENTSTR=$ARCH-glibc$GLIBC-$SIGNALVERSION IDENTSTR=$ARCH-glibc$GLIBC-$LIBRARYVERSION
KNOWN=("amd64-glibc2.28-0.11.2" "amd64-glibc2.31-0.11.2" "armhf-glibc2.28-0.11.2" "armhf-glibc2.31-0.11.2") KNOWN=("amd64-glibc2.28-0.11.2" "amd64-glibc2.31-0.11.2" "armhf-glibc2.28-0.11.2" "armhf-glibc2.31-0.11.2")
GETLIBS=1 GETLIBS=1
@ -183,7 +184,7 @@ if [[ ! " ${KNOWN[*]} " =~ " ${IDENTSTR} " ]]; then
GETLIBS=0 GETLIBS=0
fi fi
fi fi
IDENTSTR=$ARCH-glibc$GLIBC-$SIGNALVERSION IDENTSTR=$ARCH-glibc$GLIBC-$LIBRARYVERSION
if [ $OSNAME != "Linux" ]; then if [ $OSNAME != "Linux" ]; then
echo "Only Linux systems are supported (you: $OSNAME), quitting" echo "Only Linux systems are supported (you: $OSNAME), quitting"
@ -335,7 +336,7 @@ echo -n "Checking for existing signal-cli installation..."
if [ -x "$SIGNALPATH/signal/bin/signal-cli" ]; then if [ -x "$SIGNALPATH/signal/bin/signal-cli" ]; then
echo "found" echo "found"
echo -n "Checking signal-cli version..." echo -n "Checking signal-cli version..."
CHECKVER=`$SIGNALPATH/signal/bin/signal-cli -v` CHECKVER=`$SIGNALPATH/signal/bin/signal-cli --version`
echo $CHECKVER echo $CHECKVER
if [ "$CHECKVER" = "signal-cli $SIGNALVERSION" ]; then if [ "$CHECKVER" = "signal-cli $SIGNALVERSION" ]; then
echo "signal-cli matches target version...ok" echo "signal-cli matches target version...ok"
@ -427,15 +428,15 @@ check_and_compare_file $DBSYSTEMS/org.asamk.Signal.service $TMPFILE
cat >$TMPFILE <<EOF cat >$TMPFILE <<EOF
[Unit] [Unit]
Description=Send secure messages to Signal clients Description=Send secure messages to Signal clients
Requires=dbus.socket Requires=dbus.socket network-online.target
After=dbus.socket After=dbus.socket network-online.target
Wants=network-online.target Wants=network-online.target
After=network-online.target
[Service] [Service]
Type=dbus Type=dbus
Environment="SIGNAL_CLI_OPTS=-Xms2m" Environment="SIGNAL_CLI_OPTS=-Xms2m"
Environment="JAVA_HOME=$JAVA_HOME" Environment="JAVA_HOME=$JAVA_HOME"
ExecStartPre=/bin/sleep 10
ExecStart=$SIGNALPATH/signal/bin/signal-cli --config $SIGNALVAR daemon --system ExecStart=$SIGNALPATH/signal/bin/signal-cli --config $SIGNALVAR daemon --system
User=$SIGNALUSER User=$SIGNALUSER
BusName=org.asamk.Signal BusName=org.asamk.Signal