Allow setting of overlay at install time
authorJamie Cameron <jcameron@webmin.com>
Thu, 25 Feb 2010 19:51:55 +0000 (11:51 -0800)
committerJamie Cameron <jcameron@webmin.com>
Thu, 25 Feb 2010 19:51:55 +0000 (11:51 -0800)
setup.sh

index 7e950b8..0b6b434 100755 (executable)
--- a/setup.sh
+++ b/setup.sh
@@ -696,8 +696,21 @@ fi
 oldthemeline=`grep "^theme=" $config_dir/config`
 oldtheme=`echo $oldthemeline | sed -e 's/theme=//g'`
 if [ "$theme" != "" ] && [ "$oldthemeline" = "" ] && [ -d "$wadir/$theme" ]; then
-       echo "theme=$theme" >> $config_dir/config
-       echo "preroot=$theme" >> $config_dir/miniserv.conf
+       themelist=$theme
+fi
+
+# Set a special overlay if none was set before
+if [ "$overlay" = "" ]; then
+       overlay=`cat "$wadir/defaultoverlay" 2>/dev/null`
+fi
+if [ "$overlay" != "" ] && [ "$theme" != "" ] && [ -d "$wadir/$overlay" ]; then
+       themelist="$themelist $overlay"
+fi
+
+# Apply the theme and maybe overlay
+if [ "$themelist" != "" ]; then
+       echo "theme=$themelist" >> $config_dir/config
+       echo "preroot=$themelist" >> $config_dir/miniserv.conf
 fi
 
 # Set the product field in the global config