From 69fd051a862ff7290181df2c28c27083aabe6ffc Mon Sep 17 00:00:00 2001 From: Mike Gerwitz Date: Mon, 22 Aug 2011 17:10:10 -0400 Subject: [PATCH] Altered scene config options to be more consistent with style of rest of file --- scenes/err-scene | 2 +- scenes/start | 3 ++- util/showscene | 8 ++++---- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/scenes/err-scene b/scenes/err-scene index 5be2ed7..4944df3 100644 --- a/scenes/err-scene +++ b/scenes/err-scene @@ -1,4 +1,4 @@ -type=end +TYPE end STORY Uh oh. Seems like we have a problem, %name%. diff --git a/scenes/start b/scenes/start index 8df1c05..3cb302e 100644 --- a/scenes/start +++ b/scenes/start @@ -1,4 +1,5 @@ -type=trans +TYPE trans +NEXT introname STORY This project is primarily a GNU Screen integration demo. diff --git a/util/showscene b/util/showscene index 94eb65e..35a6836 100755 --- a/util/showscene +++ b/util/showscene @@ -16,8 +16,8 @@ getval="$mypath/getval" getconf() { - grep -m 1 "^$1=" <<< "$cdata" \ - | cut -d'=' -f2 + grep -m 1 "^$1 " <<< "$cdata" \ + | cut -d' ' -f2- } setscene() @@ -51,8 +51,8 @@ cdata=$( <<< "$scene" ) -type="$( getconf type )" -nextscene="$( getconf next )" +type="$( getconf TYPE )" +nextscene="$( getconf NEXT )" # clear the screen to prepare to render the scene clear