clearer separation of unofficial stuff + doesnt get installed by default

8 files changed, 24 insertions, 10 deletions

diff --git a/HOWTO b/HOWTO
index e797ba9..99dde9b 100644
--- a/HOWTO
+++ b/HOWTO
@@ -7,6 +7,6 @@ You can copy-paste the code below when logged in to the install cd
 # when network works, quit installer
 pacman -Sy git
 git clone git://github.com/Dieterbe/fifa.git /home/arch/tmp
-/home/arch/tmp/src/patch-install-cd.sh
-
+/home/arch/tmp/src/patch-install-cd.sh            # for an 'official' fifa installation
+/home/arch/tmp/src/patch-install-cd.sh unoffocial # for a fifa installation including Dieter's custom, unofficial modules
 /arch/fifa.sh <procedurename> #you can skip networking.  See readme on howto specify procedures
diff --git a/TODO b/TODO
index 54d65c8..bd362e0 100644
--- a/TODO
+++ b/TODO
@@ -1,6 +1,3 @@
-* yaourt profile. put 'unofficial' tree in git repo with modules subdir,
-  with in it dieter and yaourt. give argument to patch-install-cd to enable
-  dieters modules. put note in whatsthis.txt to clarify that
 * get interactive procedure working (decoupled flow control/other stuff. not
   yet ui vs backend), make it alpha version and post to ML
 * base procedure wordt implementatie van alles wat auto gaat uit setup script, other steps warning 'not implemented'
diff --git a/dieter/whatsthis.txt b/dieter/whatsthis.txt
deleted file mode 100644
index 5d32fef..0000000
--- a/dieter/whatsthis.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-this directory contains the stuff I (Dieter) use with fifa for myself, and is not
-intended to be part of the "official" fifa.  it's just in the same repo for
-my own convenience.
-
diff --git a/src/patch-install-cd.sh b/src/patch-install-cd.sh
index 5398657..849c0fa 100755
--- a/src/patch-install-cd.sh
+++ b/src/patch-install-cd.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
+echo "Installing fifa into the installcd vfs ..."
 SRC_DIR=`dirname $0` # the src directory in the git clone 
 GIT_DIR=`dirname $SRC_DIR` # the git clone dir itself
 mkdir -p /home/arch/fifa/docs
@@ -7,6 +8,14 @@ cp -ax $SRC_DIR/fifa.sh      /arch/fifa.sh
 cp -ax $SRC_DIR/core         /home/arch/fifa/
 cp -ax $SRC_DIR/user         /home/arch/fifa/
 cp -ax $SRC_DIR/runtime      /home/arch/fifa/
-cp -ax $GIT_DIR/dieter       /home/arch/fifa/user
 cp -ax $GIT_DIR/HOWTO        /home/arch/fifa/docs/
 cp -ax $GIT_DIR/README       /home/arch/fifa/docs/
+
+
+if [ "$1" = unofficial ]
+then
+	echo "Installing dieter's unofficial modules for fifa ..."
+	cp -ax $GIT_DIR/unofficial/modules/*       /home/arch/fifa/user/
+fi
+
+echo Done
diff --git a/dieter/procedures/automatic b/unofficial/modules/dieter/procedures/automatic
index 9bea7a6..9bea7a6 100644
--- a/dieter/procedures/automatic
+++ b/unofficial/modules/dieter/procedures/automatic
diff --git a/unofficial/modules/dieter/whatsthis.txt b/unofficial/modules/dieter/whatsthis.txt
new file mode 100644
index 0000000..5c55ca8
--- /dev/null
+++ b/unofficial/modules/dieter/whatsthis.txt
@@ -0,0 +1,2 @@
+module with stuff for my (Dieter) own environment.  Customized for my needs
+(my data and settings are in svn/ddm repositories)
\ No newline at end of file
diff --git a/unofficial/modules/yaourt/whatsthis.txt b/unofficial/modules/yaourt/whatsthis.txt
new file mode 100644
index 0000000..66a393f
--- /dev/null
+++ b/unofficial/modules/yaourt/whatsthis.txt
@@ -0,0 +1,4 @@
+I plan to someday write a module that will make yaourt available during
+installation, so you can imediately install packages from AUR on your system
+during installation.  This is something that does not belong in core, it's
+for power users only ;-)
diff --git a/unofficial/whatsthis.txt b/unofficial/whatsthis.txt
new file mode 100644
index 0000000..3c95b4e
--- /dev/null
+++ b/unofficial/whatsthis.txt
@@ -0,0 +1,6 @@
+This directory contains unofficial additions (modules) to/for fifa that I (Dieter)
+am writing.
+
+They are _not_ intended to be part of the "official" fifa.  it's just in the same repo for
+my own convenience.  Too install them on the installcd, run patch-install-cd
+with argument 'unofficial'