diff --git a/UpdateController.sh b/UpdateController.sh index ab659a4..db2b209 100755 --- a/UpdateController.sh +++ b/UpdateController.sh @@ -1,24 +1,39 @@ #!/bin/bash -update_controller_pipe="/tmp/update_controller_pipe" +fifo="" -init () { - trap "rm -f $update_controller_pipe" EXIT +GIT_SSL_NO_VERIFY=true - if [[ ! -p $update_controller_pipe ]]; then - mkfifo $update_controller_pipe +init_fifo () { + trap rm -f ${fifo} EXIT + if [ $? -eq 0 ]; then + # set trap + if [[ ! -p ${fifo} ]]; then + mkfifo ${fifo} + if [ $? -eq 0 ]; then + # fifo created + return 0 + fi + fi fi + return 1 } read_config() { - # name der fifo laesst sich ueberschreiben + fifo_dir=$(cat ${1} | jq -r .fifo_dir) + fifo="${fifo_dir}/$(cat ${1} | jq -r .fifo)" return 0 } +if read_config UpdateController.conf; then + echo "fifo=$fifo" +#init_fifo "$fifo" +fi + wait_for_trigger() { if [[ "$1" -eq -1 ]]; then # wait for external impulse - if read line <$update_controller_pipe; then + if read line <$fifo; then if [ "$line" == "quit" ] || [ "$line" == "update" ]; then echo "$line" fi @@ -95,7 +110,7 @@ UpdateController() { local trigger_timeout=-1 # read config parameters - read_config + # read_config # By default (trigger_timeout==-1), UpdateController can only be triggered # from some external source to perform an update.