New commits:
commit fb7f447962973ecc2c35ac4e40eb64fc2c57e5a4
Author: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
heyu: make yourself configurable and noninteractive (#4067)
diff --git a/utils/heyu/CONFIGURE b/utils/heyu/CONFIGURE
new file mode 100755
index 0000000..d02c812
--- /dev/null
+++ b/utils/heyu/CONFIGURE
@@ -0,0 +1,9 @@
+config_query_string H_PORT \
+ "To which port is the CM11 attached? (/dev/ttyS1 ...)" /dev/ttyS0 &&
+
+config_query_string H_CONF \
+ "Where would you like the sample X10 configuration installed?"
/etc/x10.conf &&
+
+message "${MESSAGE_COLOR}If you choose anything but the default or
~/.x10config,
+remember to run 'export X10CONFIG=$H_CONF', so heyu can find it.
+$DEFAULT_COLOR"
diff --git a/utils/heyu/FINAL b/utils/heyu/FINAL
index b34ed38..caa8025 100755
--- a/utils/heyu/FINAL
+++ b/utils/heyu/FINAL
@@ -1,4 +1,4 @@
-cat << EOF
-please specify the appropriate options in /etc/x10.conf
-you may find that heyu2 is a better alternative to this spell
-EOF
+message "$MESSAGE_COLOR
+Please specify the appropriate options in $H_CONF .
+You may find that heyu2 is a better alternative to this spell.
+$DEFAULT_COLOR"
diff --git a/utils/heyu/HISTORY b/utils/heyu/HISTORY
index 54fc7e5..4ae8850 100644
--- a/utils/heyu/HISTORY
+++ b/utils/heyu/HISTORY
@@ -1,3 +1,8 @@
+2006-07-16 Jaka Kranjc <lynxlynxlynx AT sourcemage.org>
+ * CONFIGURE: added for queries
+ * INSTALL: modified to use what the user wants, proper fix for #4067
+ * FINAL: messagised, colorized, variablized
+
2006-07-16 Treeve Jelbert <treeve AT pi.be>
* INSTALL: 'touch $HOME/.x10config'
to process dialague during installation
diff --git a/utils/heyu/INSTALL b/utils/heyu/INSTALL
index 60bb058..1bf25f2 100755
--- a/utils/heyu/INSTALL
+++ b/utils/heyu/INSTALL
@@ -1,9 +1,9 @@
-#prevent the install cripting asking about config options
-touch /root/.x10config &&
- if [ ! -e /etc/heyu/x10.conf ]; then
- mkdir -p /etc/heyu &&
- touch x10config.sample &&
- cp x10config.sample /etc/heyu/x10.conf
- fi &&
+if [[ ! -e $H_CONF ]]; then
+ mkdir -p $(dirname "$H_CONF") &&
+ cp x10config $H_CONF
+fi &&
+sed -i "s|^for FL in|& $H_CONF|" install.sh &&
+sed -i "s|^TTY.*$|TTY $H_PORT|" $H_CONF &&
+
+make install
- make install
[SM-Commit] GIT changes to master grimoire by Jaka Kranjc (fb7f447962973ecc2c35ac4e40eb64fc2c57e5a4),
Jaka Kranjc, 07/16/2006