[Debian-NP-Commits] r252 - people/vagrant/simple-cdd

Vagrant Cascadian debian-np-devel@lists.alioth.debian.org
Thu, 25 Nov 2004 19:46:35 -0700


Author: vagrant-guest
Date: Thu Nov 25 19:46:30 2004
New Revision: 252

Modified:
   people/vagrant/simple-cdd/build-simple-cdd
   people/vagrant/simple-cdd/simple-cdd-profiles
Log:
little bugfixes


Modified: people/vagrant/simple-cdd/build-simple-cdd
==============================================================================
--- people/vagrant/simple-cdd/build-simple-cdd	(original)
+++ people/vagrant/simple-cdd/build-simple-cdd	Thu Nov 25 19:46:30 2004
@@ -89,11 +89,11 @@
 fi
 
 current_installer="dists/$CODENAME/main/installer-$ARCH/current"
-if [ "$debian_installer_di" != "$current_installer" ]; then
-  echo "WARNING: using installer from: $debian_installer_di"
+if [ -n "$debian_installer_dir" ] && [-n "$current_installer" ] && [ "$debian_installer_dir" != "$current_installer" ]; then
+  echo "WARNING: using installer from: $debian_installer_dir"
   cd $MIRROR
   mkdir -p $current_installer
-  rsync --delete -aWHr $debian_installer_di/. $current_installer/
+  rsync --delete -aWHr $debian_installer_dir/. $current_installer/
 fi
 
 cd $BASEDIR

Modified: people/vagrant/simple-cdd/simple-cdd-profiles
==============================================================================
--- people/vagrant/simple-cdd/simple-cdd-profiles	(original)
+++ people/vagrant/simple-cdd/simple-cdd-profiles	Thu Nov 25 19:46:30 2004
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-debconf-loadtemplates simple-cdd /usr/local/simple-cdd/simple-cdd.templates
+debconf-loadtemplate simple-cdd /usr/local/simple-cdd/simple-cdd.templates
 
 # load debconf
 . /usr/share/debconf/confmodule