--- builds_bin/build_installer	2007/07/19 19:59:15	1.9
+++ builds_bin/build_installer	2007/11/07 17:19:07	1.10
@@ -1,50 +1,74 @@
 #!/bin/sh
 
-[ -d cdrom.image ] || (echo "No cdrom.image directory?"; exit 1)
-
 distname='SME Server'
-distrel=7
 distvers=$(basename $(pwd))
+distrel=${distvers:0:1}
 distarch=$(uname -i)
 
-PYTHONPATH=/usr/lib/anaconda/ /usr/lib/anaconda-runtime/genhdlist \
+if ! [ -d $distarch ]
+then
+    echo "No $distarch directory?"
+    exit 1
+fi
+
+if [ "$distrel" == "7" ]
+then
+    PYTHONPATH=/usr/lib/anaconda/ /usr/lib/anaconda-runtime/genhdlist \
 	--productpath SME \
 	--withnumbers \
-	$(pwd)/cdrom.image/
+	$(pwd)/$distarch/
 
-PYTHONPATH=/usr/lib/anaconda/ /usr/lib/anaconda-runtime/pkgorder \
+    PYTHONPATH=/usr/lib/anaconda/ /usr/lib/anaconda-runtime/pkgorder \
 	--product SME \
-	$(pwd)/cdrom.image \
+	$(pwd)/$distarch \
 	$distarch > pkgorder
 
-for PKG in /releases/$distrel/smeextras/$distarch/RPMS/*.rpm
-do
-    PKGFILE=$(basename $PKG)
-    if [ ! -f $(pwd)/cdrom.image/SME/$PKGFILE ]
-    then
-        ln -sf $PKG $(pwd)/cdrom.image/SME/RPMS/
-    fi
-done
+    for PKG in /releases/$distrel/smeextras/$distarch/RPMS/*.rpm
+    do
+	PKGFILE=$(basename $PKG)
+	if [ ! -f $(pwd)/$distarch/SME/RPMS/$PKGFILE ]
+	then
+	    ln -sf $PKG $(pwd)/$distarch/SME/RPMS/
+	fi
+    done
 
-PYTHONPATH=/usr/lib/anaconda/ sudo /usr/lib/anaconda-runtime/buildinstall \
+    PYTHONPATH=/usr/lib/anaconda/ sudo /usr/lib/anaconda-runtime/buildinstall \
 	--product "$distname" \
 	--version "$distrel.0" \
 	--release "$distname" \
 	--prodpath SME \
 	--pkgorder pkgorder \
-	$(pwd)/cdrom.image/
+	$(pwd)/$distarch/
+
+    sed -i 's@1,2,3@1@' $(pwd)/$distarch/.discinfo
+else
+    for PKG in /releases/testing/$distrel/smeextras/$distarch/RPMS/*.rpm
+    do
+	PKGFILE=$(basename $PKG)
+	if [ ! -f $(pwd)/$distarch/SME/$PKGFILE ]
+	then
+	    ln -sf $PKG $(pwd)/$distarch/SME/
+	fi
+    done
+
+    PYTHONPATH=/usr/lib/anaconda/ sudo /usr/lib/anaconda-runtime/buildinstall \
+	--product "$distname" \
+	--version "$distrel.0" \
+	--release "$distname" \
+	--prodpath SME \
+	--bugurl http://bugs.contribs.org/ \
+	$(pwd)/$distarch/
+fi
 
 # Remove previous linked files
-find $(pwd)/cdrom.image/SME/RPMS/ -type l | xargs rm -f
+find $(pwd)/$distarch/SME/ -type l | xargs rm -f
 
 # Copy updated isolinux files
-sudo cp -f /builds/isolinux/* $(pwd)/cdrom.image/isolinux/
-
-sed -i 's@1,2,3@1@' $(pwd)/cdrom.image/.discinfo
+sudo cp -f /stage/extra/isolinux/$distrel/* $(pwd)/$distarch/isolinux/
 
-sudo chown -R buildcvs:developers $(pwd)/cdrom.image/
-sudo chmod -R g+w $(pwd)/cdrom.image/
+sudo chown -R 9000:9001 $(pwd)/$distarch/
+sudo chmod -R u+rwX,g+rwX,o+rX,o-w $(pwd)/$distarch/
 
-echo "You now need to run /builds/bin/build_ISO as non-root"
+echo "You now need to run /stage/bin/build_ISO as non-root"
 
 # That's it.