Getting the scripts in the repo in sync with my changes late last night.

alvinj · Jan 24, 2012 · 43ddca5 · 43ddca5
1 parent 20f044c
commit 43ddca5
Show file tree

Hide file tree

Showing 10 changed files with 5 additions and 90 deletions.
diff --git a/custom/Install/install-data/sarah.gram b/custom/Install/install-data/sarah.gram
@@ -25,9 +25,11 @@ public <LLAP> = live long and prosper;
 public <JUST_CHECKING> = just checking;
 
 // SCRIPTS, AGENTS
-public <WEATHER_CURRENT> = (current weather | current weather conditions);
-public <DATE> = [computer] what day is it;
-public <TIME> = [computer] what time is it;
+public <WEATHER_CURRENT> = current weather;
+public <DATE> = what day is it;
+
+// now handled by CurrentTimePlugin
+public <TIME> = what time is it;
 
 // PHYSICAL/ROBOT INTERACTIONS (SUCH AS ARDUINO)
 public <FIREPLACE_ON> = fireplace on;

diff --git a/custom/Install/install-data/say_yes.data b/custom/Install/install-data/say_yes.data
@@ -1,8 +1,6 @@
 Yo
 Yes
 You rang?
-Hey
 Dude
 Yes, master
-Yo mama
 What's up?
diff --git a/custom/Install/install-data/standard.c2p b/custom/Install/install-data/standard.c2p
@@ -14,9 +14,7 @@ ITUNES_PLAY_MUSIC : play music
 ITUNES_STOP       : stop music
 ITUNES_NEXT_TRACK : next song
 ITUNES_NEXT_TRACK : next track
-WEATHER_CURRENT   : current weather
 DATE              : what day is it
-TIME              : what time is it
 GOOD_MORNING      : good morning
 GOOD_AFTERNOON    : good afternoon
 GOOD_EVENING      : good evening

diff --git a/custom/Install/install-data/standard.commands b/custom/Install/install-data/standard.commands
@@ -19,10 +19,6 @@ JUST_CHECKING         : say "Okay"
 
 # these commands show a little more applescript
 DATE                  : say (date string of (current date))
-TIME                  : say (time string of (current date))
-
-# TODO replace this with a plugin module
-WEATHER_CURRENT       : do shell script "osascript $HOME/Sarah/datascripts/weather-current.scpt"
 
 # this syntax works, if needed 
 #COMPUTER : do shell script "osascript $HOME/Sarah/data/scripts/yes.scpt"

diff --git a/scripts/scottie.scpt b/scripts/scottie.scpt
diff --git a/scripts/thank_you.data b/scripts/thank_you.data
diff --git a/scripts/thank_you.scpt b/scripts/thank_you.scpt
diff --git a/scripts/weather-current.scpt b/scripts/weather-current.scpt
diff --git a/scripts/yes.data b/scripts/yes.data
diff --git a/scripts/yes.scpt b/scripts/yes.scpt