From 8a3920d3043bffc1eab55e3b357881b287ae43c6 Mon Sep 17 00:00:00 2001
From: Pierre Pronchery <khorben@defora.org>
Date: Thu, 21 Aug 2008 21:57:33 +0000
Subject: [PATCH] Allow the user to specify some of the variables

---
 src/deforaos-build.sh  | 12 +++++++-----
 src/deforaos-update.sh |  6 +++---
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/deforaos-build.sh b/src/deforaos-build.sh
index 57347e4..8a4ee86 100755
--- a/src/deforaos-build.sh
+++ b/src/deforaos-build.sh
@@ -3,20 +3,22 @@
 
 
 #variables
-CVSROOT=":pserver:anonymous@cvs.defora.lan:/Data/CVS"
+[ -z "$ARCH" ] && ARCH=`uname -m`
+[ -z "$CVSROOT" ] && CVSROOT=":pserver:anonymous@cvs.defora.org:/Data/CVS"
+[ -z "$OS" ] && OS=`uname -s`
+#private
 DEVNULL="/dev/null"
 MODULE="DeforaOS"
-[ -z "$ARCH" ] && ARCH=`uname -m`
-[ -z "$OS" ] && OS=`uname -s`
 SRC="$HOME/build/$OS-$ARCH"
 DST="$HOME/destdir/$OS-$ARCH"
-
 #executables
 CVS="cvs -q"
 MAKE="make"
 MKDIR="mkdir -p"
 RM="rm -f"
 
+export CVSROOT
+
 
 #functions
 #error
@@ -43,7 +45,7 @@ $MKDIR "$SRC"							|| error
 cd "$SRC"							|| error
 echo ""
 echo "Checking out CVS module $MODULE:"
-$CVS "-d$CVSROOT" co "$MODULE" > "$DEVNULL"			|| error
+$CVS co "$MODULE" > "$DEVNULL"					|| error
 SRC="$SRC/$MODULE"
 
 #create directories
diff --git a/src/deforaos-update.sh b/src/deforaos-update.sh
index cbac89c..95f231c 100755
--- a/src/deforaos-update.sh
+++ b/src/deforaos-update.sh
@@ -3,14 +3,14 @@
 
 
 #variables
-CVSROOT=":pserver:anonymous@cvs.defora.org:/Data/CVS"
+[ -z "$CVSROOT" ] && CVSROOT=":pserver:anonymous@cvs.defora.org:/Data/CVS"
+#private
 DATE=`date '+%Y%m%d'`
 DESTDIR="/var/www/htdocs/download/snapshots"
 MODULE="DeforaOS"
 SRC="$HOME/$MODULE"
-
 #executables
-CVS="cvs"
+CVS="cvs -q"
 LN="ln -f"
 RM="rm -f"