diff --git a/README.md b/README.md index 2c358ef..1550f97 100644 --- a/README.md +++ b/README.md @@ -3,21 +3,50 @@ Ceci est un testeur simple pour l'envoi de messages Cesium + # Utilisation ``` -chmod u+x sendmsg.sh -./sendmsg.sh +chmod u+x readmsg.sh sendmsg.sh deletemsg.sh ``` Par défaut utilise l'émetteur, le fichier de trousseau ainsi que le noeud Cesium+ indiqué dans le fichier `.env`. +Si non renseigné ni dans le fichier `.env` ni en argument de la commande, alors ils seront demandés interactivement. -## Options +## Lecture des messages +``` +./readmsg.sh +``` + +### Options +``` + -r,--recipient Uses as recipient of the messages. + -k,--key Path to the pubsec keychain file of the issuer. + -n,--number Display the lasts messages from Cesium (tail-like format) + -o,--outbox Read outbox messages instead of inbox + -h,--help Display this help +``` + +## Envoi de messages ``` ./sendmsg.sh - Par défaut, demande le titre, le contenu et le destinataire en mode interactif. - -Options: - -t Mode test: Utilise le fichier "test.txt" ainsi que le même destinataire que l'émetteur. - -f Lit le fichier avec le titre en première ligne et le contenu dans le reste du fichier pour le message. - -r Utilise comme destinataire du message. - -i Utilise comme émetteur du message. - -k Chemin vers le fichier de trousseau PubSec de l'émetteur. - -h Affiche cette aide (en anglais). +``` + +### Options +``` + -t Test mode: Uses the "test.txt" file as well as the same recipient as the sender. + -f,--file Read the file with title in first line and content in rest of the file for the message. + -r,--recipient Uses as recipient of the message. + -i,--issuer Uses as issuer of the message (Could be remove in future version by calculating pubkey from privatekey). + -k,--key Path to the pubsec keychain file of the issuer. + -h,--help Display this help +``` + +## Suppression de messages +``` +./sendmsg.sh +``` + +### Options +``` + -id,--id Delete the message with ID . + -i,--issuer Uses as issuer of the message. + -k,--key Path to the pubsec keychain file of the issuer. + -o,--outbox Delete outbox messages instead of inbox + -h,--help Display this help ``` diff --git a/deletemsg.sh b/deletemsg.sh index c4ef716..719a124 100755 --- a/deletemsg.sh +++ b/deletemsg.sh @@ -9,13 +9,26 @@ source .env REGEX_PUBKEYS="[a-zA-Z0-9]{42,44}" +# Help display +helpOpt() { + echo -e "Cesium+ messages deleting + Default: ID in interactive mode. + Advice: Fill your .env file for more fun. + Example: $0 + + \rOptions: + -id,--id \tDelete the message with ID . + -i,--issuer \tUses as issuer of the message. + -k,--key \t\tPath to the pubsec keychain file of the issuer. + -o,--outbox\t\t\tDelete outbox messages instead of inbox + -h,--help\t\t\tDisplay this help" +} + # Parse options declare -a args=($@) for ((i=0; i<${#args[*]}; ++i)) do case ${args[$i]} in - -t|--test) file="test.txt" - recipient=$issuer;; -o|--outbox) type=outbox;; -id|--id) id="${args[$i+1]}" [[ -z $id ]] && echo "Veuillez préciser un ID de message." && exit 1;; @@ -23,6 +36,7 @@ do [[ -z $issuer ]] && echo "Veuillez préciser un émetteur." && exit 1;; -k|--key) dunikey="${args[$i+1]}" [[ -z $dunikey ]] && echo "Veuillez préciser un fichier de trousseau." && exit 1;; + -h|--help) helpOpt && exit 0;; *) [[ "${args[$i]}" == "-"* ]] && echo "Option inconnue." && exit 1;; esac done @@ -30,6 +44,7 @@ done if [[ -z $type ]]; then type="inbox" fi +[[ -z $id ]] && id=$1 if [[ -z $id ]]; then read -p "ID de message: " ID fi diff --git a/readmsg.sh b/readmsg.sh index 50a3e89..42d23dc 100755 --- a/readmsg.sh +++ b/readmsg.sh @@ -11,13 +11,17 @@ source .env # Help display helpOpt() { - echo -e "This is a simple tester for Cesium+ messages sending + echo -e "Cesium+ messages sender \r$0 - Default, ask title, content and recipient in interactive mode. + Default: ask recipient in interactive mode. + Advice: Fill your .env file for more fun. \rOptions: -r,--recipient \tUses as recipient of the messages. - -k,--key \t\tPath to the pubsec keychain file of the issuer." + -k,--key \t\tPath to the pubsec keychain file of the issuer. + -n,--number \tDisplay the lasts messages from Cesium (tail-like format) + -o,--outbox\t\t\tRead outbox messages instead of inbox + -h,--help\t\t\tDisplay this help" } REGEX_PUBKEYS="[a-zA-Z0-9]{42,44}" @@ -34,7 +38,7 @@ do -k|--key) dunikey="${args[$i+1]}" [[ -z $dunikey ]] && echo "Veuillez préciser un fichier de trousseau." && exit 1;; -o|--outbox) type=outbox;; - -n|--numbers) nbrRaw="${args[$i+1]}";; + -n|--number) nbrRaw="${args[$i+1]}";; -n*) nbrRaw="${args[$i]:2}";; -h|--help) helpOpt && exit 0;; *) [[ "${args[$i]}" == "-"* ]] && echo "Option inconnue." && exit 1;; diff --git a/sendmsg.sh b/sendmsg.sh index 1f44cc3..6553620 100755 --- a/sendmsg.sh +++ b/sendmsg.sh @@ -11,16 +11,18 @@ source .env # Help display helpOpt() { - echo -e "This is a simple tester for Cesium+ messages sending - \r$0 - Default, ask title, content and recipient in interactive mode. + echo -e "Cesium+ messages sender + Default: ask title, content and recipient in interactive mode. + Advice: Fill your .env file for more fun. + Example: $0 -f -r -i -k \rOptions: -t\t\t\t\tTest mode: Uses the \"test.txt\" file as well as the same recipient as the sender. -f,--file \t\tRead the file with title in first line and content in rest of the file for the message. -r,--recipient \tUses as recipient of the message. - -i,--issuer \tUses as issuer of the message. - -k,--key \t\tPath to the pubsec keychain file of the issuer." + -i,--issuer \tUses as issuer of the message (Could be remove in future version by calculating pubkey from privatekey). + -k,--key \t\tPath to the pubsec keychain file of the issuer. + -h,--help\t\t\tDisplay this help" } REGEX_PUBKEYS="[a-zA-Z0-9]{42,44}"