Merge branch 'master' of ssh://git.chaospott.de:2222/Chaospott/foodoord

foodoor

@@ -20,7 +20,7 @@ fi
 
 case $action in
   close|open)
-    echo $action | tee $PIPE_PATH > /tmp/state
+    echo $action | tee $PIPE_PATH |sed 's/open/UNLOCKED/;s/close/LOCKED/' >  /state
    ;;
   status)
    ;;
@@ -32,6 +32,6 @@ esac
 
 if [ $isTriggerActivated -eq 1 ]
 then
-	cat /tmp/state
+	cat /state
 	sleep 2
 fi

foodoor-update-keydb

@@ -41,7 +41,7 @@ rm -f ${temp_outfile}
 				fi
 
 				if [ "$valid" = true ]; then
-					echo "command=\"/usr/sbin/foodoor \$action \",no-port-forwarding,no-X11-forwarding,no-agent-forwarding ${keyfile}" >> ${temp_outfile}
+					echo "command=\"/usr/sbin/foodoor \$action \",no-port-forwarding,no-X11-forwarding,no-agent-forwarding $(cat ${keyfile})" >> ${temp_outfile}
 				fi
 			fi
 		done