fixes/cleanups for runtime packages and repositories. Not much use in making yauort a module, its integrated now

1 files changed, 40 insertions, 2 deletions

diff --git a/examples/deployconfig-dieter b/examples/deployconfig-dieter
index c626a64..9e80dc4 100644
--- a/examples/deployconfig-dieter
+++ b/examples/deployconfig-dieter
@@ -1,8 +1,13 @@
 #!/bin/bash
 # An example config for the deployment procedure
 
-#TODO: install ruby-gems too
+# TODO: install ruby-gems too
+# TODO * dieter/automatic: wait for yaourt --config fix ( http://forums.archlinux.fr/post23171.html#23171 )
+# TODO:* dieter/automatic: put config files from svn in place first, so that if a package has an update, it can do it's thing.
 
+depend_module yaourt
+
+var_RUNTIME_REPOSITORIES=(archlinuxfr "Server = http://repo.archlinux.fr/$var_ARCH")
 var_RUNTIME_PACKAGES="svn"
 
 DEPLOY_CLASS=desktop-a7n8x
@@ -23,6 +28,19 @@ worker_fetch_configs ()
 }
 
 
+worker_runtime_packages ()
+{
+        for pkg in $var_RUNTIME_PACKAGES
+        do
+                $PACMAN -Sy --noconfirm --needed $pkg
+        done
+
+	# We'll install packages on the target system, for that we need yaourt
+        _runtime_yaourt
+        _yaourt_replace_pacman
+}
+
+
 worker_package_list ()
 {
 	$SVN export $SVN_BASE/ddm-configs/$DEPLOY_CLASS/trunk/package-list $var_PKG_FILE || die_error "Could not export package list!"
@@ -55,4 +73,24 @@ worker_configure_home ()
 {
 	#TODO checkout from svn
 	true
-}
\ No newline at end of file
+}
+
+
+
+# See http://wiki.archlinux.org/index.php/Yaourt
+
+worker_install_packages () #pre_ / post_ callbacks would be useful here
+{
+	PACMAN_BACKUP=$PACMAN
+	PACMAN_TARGET_BACKUP=$PACMAN_TARGET
+	PACMAN=${PACMAN//pacman/yaourt}
+	PACMAN_TARGET=${PACMAN_TARGET//pacman/yaourt}
+
+	target_prepare_pacman core
+	[ -z "$TARGET_PACKAGES" ] && die_error "No packages listed to be installed!"
+	installpkg
+
+	PACMAN=$PACMAN_BACKUP
+	PACMAN_TARGET=$PACMAN_TARGET_BACKUP
+
+}