Update libsignal-service

[signal-cli] / README.md

diff --git a/README.md b/README.md
index b3c9398249fe646aded88ed91a549cf982ea3861..d95b260172acfc671f61e4f494cb73fd2bb6ef69 100644 (file)
--- a/README.md
+++ b/README.md
@@ -1,97 +1,73 @@
-# textsecure-cli
+# signal-cli

 
 

-textsecure-cli is a commandline interface for [libtextsecure-java](https://github.com/WhisperSystems/libtextsecure-java). It supports registering, verifying, sending and receiving messages. However receiving messages currently only works with a patched libtextsecure-java, because libtextsecure-java [does not yet support registering for the websocket support](https://github.com/WhisperSystems/libtextsecure-java/pull/5). For registering you need a phone number where you can receive SMS or incoming calls.
-It is primarily intended to be used on servers to notify admins of important events.
+signal-cli is a commandline interface for [libsignal-service-java](https://github.com/WhisperSystems/libsignal-service-java). It supports registering, verifying, sending and receiving messages.
+To be able to link to an existing Signal-Android/signal-cli instance, signal-cli uses a [patched libsignal-service-java](https://github.com/AsamK/libsignal-service-java), because libsignal-service-java does not yet support [provisioning as a slave device](https://github.com/WhisperSystems/libsignal-service-java/pull/21).
+For registering you need a phone number where you can receive SMS or incoming calls.
+signal-cli is primarily intended to be used on servers to notify admins of important events. For this use-case, it has a dbus interface, that can be used to send messages from any programming language that has dbus bindings.

 
 

-## Usage
+## Installation

 
 

-usage: textsecure-cli [-h] [-u USERNAME] [-v] {register,verify,send,quitGroup,updateGroup,receive} ...
+You can [build signal-cli](#building) yourself, or use the [provided binary files](https://github.com/AsamK/signal-cli/releases/latest), which should work on Linux, macOS and Windows. For Arch Linux there is also a [package in AUR](https://aur.archlinux.org/packages/signal-cli/). You need to have at least JRE 7 installed, to run signal-cli.

 
 

-* Register a number (with SMS verification)
+### Install system-wide on Linux
+See [latest version](https://github.com/AsamK/signal-cli/releases).
+```sh
+export VERSION=<latest version, format "x.y.z">
+wget https://github.com/AsamK/signal-cli/releases/download/v"${VERSION}"/signal-cli-"${VERSION}".tar.gz
+sudo tar xf signal-cli-"${VERSION}".tar.gz -C /opt
+sudo ln -sf /opt/signal-cli-"${VERSION}"/bin/signal-cli /usr/local/bin/
+```

 
 

-        textsecure-cli -u USERNAME register
+## Usage
+
+Important: The USERNAME (your phone number) must include the country calling code, i.e. the number must start with a "+" sign. (See [Wikipedia](https://en.wikipedia.org/wiki/List_of_country_calling_codes) for a list of all country codes.

 
 

-* Register a number (with voice verification)
+* Register a number (with SMS verification)

 
 

-        textsecure-cli -u USERNAME register -v
+        signal-cli -u USERNAME register

 
 * Verify the number using the code received via SMS or voice
 
 
 * Verify the number using the code received via SMS or voice
 

-        textsecure-cli -u USERNAME verify CODE
+        signal-cli -u USERNAME verify CODE

 
 

-* Send a message to one or more recipients
+* Send a message

 
 

-        textsecure-cli -u USERNAME send -m "This is a message" [RECIPIENT [RECIPIENT ...]] [-a [ATTACHMENT [ATTACHMENT ...]]]
+        signal-cli -u USERNAME send -m "This is a message" RECIPIENT

 
 * Pipe the message content from another process.
 
 
 * Pipe the message content from another process.
 

-        uname -a | textsecure-cli -u USERNAME send [RECIPIENT [RECIPIENT ...]]
-
-* Groups
-
- * Create a group
-
-          textsecure-cli -u USERNAME updateGroup -n "Group name" -m [MEMBER [MEMBER ...]]
-
- * Update a group
-
-          textsecure-cli -u USERNAME updateGroup -g GROUP_ID -n "New group name"
-
- * Send a message to a group
+        uname -a | signal-cli -u USERNAME send RECIPIENT
+        
+* Receive messages

 
 

-          textsecure-cli -u USERNAME send -m "This is a message" -g GROUP_ID
+        signal-cli -u USERNAME receive

 
 

-## DBus service
-
-textsecure-cli can run in daemon mode and provides an experimental dbus interface.
-For dbus support you need jni/unix-java.so installed on your system (Debian: libunixsocket-java ArchLinux: libmatthew-unix-java (AUR)).
-
-* Run in daemon mode (dbus session bus)
-
-          textsecure-cli -u USERNAME daemon
-
-* Send a message via dbus
-
-          textsecure-cli --dbus send -m "Message" [RECIPIENT [RECIPIENT ...]] [-a [ATTACHMENT [ATTACHMENT ...]]]
-
-### System bus
-
-To run on the system bus you need to take some additional steps.
-It’s advisable to run textsecure-cli as a separate unix user, the following steps assume you created a user named *textsecure*.
-These steps, executed as root, should work on all distributions using systemd.
-
-```bash
-cp data/org.asamk.TextSecure.conf /etc/dbus-1/system.d/
-cp data/org.asamk.TextSecure.service /usr/share/dbus-1/system-services/
-cp data/textsecure.service /etc/systemd/system/
-sed -i -e "s|%dir%|<INSERT_INSTALL_PATH>|" -e "s|%number%|<INSERT_YOUR_NUMBER>|" /etc/systemd/system/textsecure.service
-systemctl daemon-reload
-systemctl enable textsecure.service
-systemctl reload dbus.service
-```
-
-Then just execute the send command from above, the service will be autostarted by dbus the first time it is requested.
+For more information read the [man page](https://github.com/AsamK/signal-cli/blob/master/man/signal-cli.1.adoc) and the [wiki](https://github.com/AsamK/signal-cli/wiki).

 
 ## Storage
 
 The password and cryptographic keys are created when registering and stored in the current users home directory:
 
 
 ## Storage
 
 The password and cryptographic keys are created when registering and stored in the current users home directory:
 

+        $HOME/.config/signal/data/
+
+For legacy users, the old config directory is used as a fallback:
+

         $HOME/.config/textsecure/data/
 
 ## Building
 
 This project uses [Gradle](http://gradle.org) for building and maintaining
         $HOME/.config/textsecure/data/
 
 ## Building
 
 This project uses [Gradle](http://gradle.org) for building and maintaining

-dependencies.
+dependencies. If you have a recent gradle version installed, you can replace `./gradlew` with `gradle` in the following steps.

 
 1. Checkout the source somewhere on your filesystem with
 
 
 1. Checkout the source somewhere on your filesystem with
 

-        git clone https://github.com/AsamK/textsecure-cli.git
+        git clone https://github.com/AsamK/signal-cli.git

 
 2. Execute Gradle:
 
         ./gradlew build
 
 
 2. Execute Gradle:
 
         ./gradlew build
 

-3. Create shell wrapper in *build/install/textsecure-cli/bin*:
+3. Create shell wrapper in *build/install/signal-cli/bin*:

 
         ./gradlew installDist
 
 
         ./gradlew installDist
 


@@ -104,8 +80,8 @@ If you use a version of the Oracle JRE and get an InvalidKeyException you need t
 
 ## License
 
 
 ## License
 

-This project uses libtextsecure-java from Open Whisper Systems:
+This project uses libsignal-service-java from Open Whisper Systems:

 
 

-https://github.com/WhisperSystems/libtextsecure-java
+https://github.com/WhisperSystems/libsignal-service-java

 
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html
 
 Licensed under the GPLv3: http://www.gnu.org/licenses/gpl-3.0.html