aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitmodules3
m---------external/annoyme0
-rwxr-xr-xinstall4
-rwxr-xr-xlocal/bin/annoyme17
-rwxr-xr-xlocal/sbin/annoyme-request50
5 files changed, 5 insertions, 69 deletions
diff --git a/.gitmodules b/.gitmodules
index 3a6f663..a02eb04 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -37,3 +37,6 @@
[submodule "vim/bundle/vim-autotag"]
path = vim/bundle/vim-autotag
url = https://github.com/craigemery/vim-autotag.git
+[submodule "external/annoyme"]
+ path = external/annoyme
+ url = git@cynerd.cz:annoyme
diff --git a/external/annoyme b/external/annoyme
new file mode 160000
+Subproject bc899e872b336db938f525b1aa889e034cde4c4
diff --git a/install b/install
index 46855e9..acaa360 100755
--- a/install
+++ b/install
@@ -121,8 +121,8 @@ fi
read -p "Install email synchronization? (Y/n) "
if [[ $REPLY =~ ^[Yy]?$ ]]; then
- inst local/bin/annoyme ~/.local/bin/
- inst local/sbin/annoyme-request ~/.local/sbin/
+ inst external/annoyme/src/annoyme ~/.local/bin/
+ inst external/annoyme/src/annoyme-request ~/.local/sbin/
inst config/systemd/user/syncemail.service ~/.config/systemd/user
inst_email_sync
# Contains:
diff --git a/local/bin/annoyme b/local/bin/annoyme
deleted file mode 100755
index 92a42d4..0000000
--- a/local/bin/annoyme
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-DOT_ANNOYME=~/.annoyme
-
-for NAME in `ls "$DOT_ANNOYME" | grep -E '.pid$' | sed 's/\.pid$//'`; do
- echo -e "\033[0;31m$NAME:\033[0m" `cat "$DOT_ANNOYME/$NAME.desc"`
- echo -ne "\033[0;1m Y/n: \033[0;0m"
- read
- if [[ $REPLY =~ ^[Yy]?$ ]]; then
- if $DOT_ANNOYME/$NAME.script > "$DOT_ANNOYME/$NAME.out"; then
- kill -SIGUSR1 `cat "$DOT_ANNOYME/$NAME.pid"`
- else
- kill -SIGUSR2 `cat "$DOT_ANNOYME/$NAME.pid"`
- fi
- fi
- echo
-done
diff --git a/local/sbin/annoyme-request b/local/sbin/annoyme-request
deleted file mode 100755
index 28a9864..0000000
--- a/local/sbin/annoyme-request
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/bash
-
-DOT_ANNOYME=~/.annoyme
-
-NAME=$1
-EC=2
-
-onexit() {
- rm -f "$DOT_ANNOYME/$NAME.script"
- rm -f "$DOT_ANNOYME/$NAME.pid"
- rm -f "$DOT_ANNOYME/$NAME.desc"
- rm -f "$DOT_ANNOYME/$NAME.out"
- kill $SLEEPID 2>/dev/null
- exit $EC
-}
-trap onexit EXIT INT QUIT TERM ABRT
-
-mkdir -p $DOT_ANNOYME
-
-echo "#!/bin/bash" > "$DOT_ANNOYME/$NAME.script"
-while read -r LINE; do
- echo "$LINE" >> "$DOT_ANNOYME/$NAME.script"
-done
-chmod +x "$DOT_ANNOYME/$NAME.script"
-echo "$$" > "$DOT_ANNOYME/$NAME.pid"
-echo "$2" > "$DOT_ANNOYME/$NAME.desc"
-
-onsuccess() {
- echo "User intervention successful." 1>&2
- cat "$DOT_ANNOYME/$NAME.out"
- EC=0
- exit
-}
-
-onfailure() {
- echo "User intervention failed." 1>&2
- EC=1
- exit
-}
-
-trap onsuccess SIGUSR1
-trap onfailure SIGUSR2
-
-echo "Waiting for user intervention using annoyme" 1>&2
-notify-send -a "$NAME" "$NAME: User intervention required" "$2"
-sleep 3h &
-SLEEPID=$!
-wait $SLEEPID
-echo "User intervention timed out." 1>&2
-notify-send -a "$NAME" "$NAME: User intervention request timed out."