Cleaned up things, RENAMED VARIABLES! now we have ANSW_R_* and ANSW_L_* namespaces...

[mirrors/libpurple-core-answerscripts.git] / purple / answerscripts.sh

diff --git a/purple/answerscripts.sh b/purple/answerscripts.sh
index bea26b3abad65449cf65d8d810f382aac58296ea..3b72f961a438905d4ff97246aae90e2777e110b8 100755 (executable)
--- a/purple/answerscripts.sh
+++ b/purple/answerscripts.sh
@@ -12,16 +12,11 @@
 #              - AB?!_ scripts without numbers are NOT executed!
 #              - 00    executed immediately, zero or single line output (parallel async processing)
 #              - 01-48 executed immediately, multiline output (serial processing)
-#              - 49    delay script (adds random delay to emulate human factor)
+#              - 49    delay script (adds random delay to emulate human factor, no user scripts at this level!)
 #              - 50    executed after delay, zero or single line output (parallel async processing)
 #              - 51-79 executed after delay, multiline output (serial processing)
 #              - 80-99 reserved for future
 
-#legacy support, please do NOT use PURPLE_* variables in new scripts,
-#this will be removed in future releases:
-export PURPLE_FROM="$ANSW_FROM"
-export PURPLE_MSG="$ANSW_MSG"
-
 #this may be modified to use run-parts from coreutils in future (can't get it to work):
 
 dir="$(dirname "$0")"; cd "$dir" #chdir to ~/.purple/ or similar
@@ -31,7 +26,8 @@ if test -d "$dir"; then
 
                #sleep at 49 (this can be replaced by 49-delay.sh, but this should be faster)
                [ $i -eq 49 ] && {
-                       sleep $(( 2 + ($RANDOM % 8) )); #2-9 seconds of sleep
+                       find "$dir"/[5-9][0-9]-* -executable | grep . >/dev/null && #check if it's worth waiting
+                               sleep $(( 2 + ($RANDOM % 8) )); #2-9 seconds of sleep
                        continue;
                }