--- trunk/mage/usr/lib/mage/mage4.sh	2005/12/01 12:40:21	287
+++ trunk/mage/usr/lib/mage/mage4.sh	2005/12/04 12:02:21	295
@@ -1,6 +1,6 @@
 #!/bin/sh
 # Magellan Linux Installer (mage.sh)
-# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.9 2005-12-01 12:40:21 niro Exp $
+# $Header: /home/cvsd/magellan-cvs/magellan-src/mage/usr/lib/mage/mage4.sh,v 1.10 2005-12-04 12:02:21 niro Exp $
 
 # default die function
 die()
@@ -21,12 +21,6 @@
 	source ${MLIBDIR}/mage4.functions.sh || \
 	die "mage functions missing"
 
-# for tests only
-#source /home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage/mage.rc.global
-#source /etc/mage.rc
-#source /home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage/mage4.functions.sh
-#MLIBDIR=/home/tjoke/alx-cvs/magellan-src/mage/usr/lib/mage
-
 ## only for tests -> normally in /etc/rc.d/init.d/functions
 COLRED="\033[1;6m\033[31m"
 COLGREEN="\033[1;6m\033[32m"
@@ -69,14 +63,16 @@
 fi
 
 # default messages
-showversion() {
+showversion()
+{
 	local MAGEVERSION="$(< ${MLIBDIR}/version)"
 
 	echo -en "Magellan Package Manager v${MAGEVERSION} "
 	echo -e  "-- Niels Rogalla (niro@magellan-linux.de)"
 }
 
-print_usage(){
+print_usage()
+{
 	showversion
 	echo
 	echo "Usage: $(basename $0) [option] pkgname ..."
@@ -102,10 +98,10 @@
 #	echo "NOINSTALL=yes $(basename $0) srcinstall PACKAGE"
 #	echo "Builds a Package with its dependencies, but won't install anything."
 #	echo
-	echo "USE_UNSTABLE=true $(basename $0) [src]install PACKAGE"
+	echo "MAGE_DISTRIBUTION=unstable $(basename $0) [src]install PACKAGE"
 	echo "Overrides stable packages; you can install packages that are marked unstable."
 	echo
-	echo "USE_TESTING=true $(basename $0) [src]install PACKAGE"
+	echo "MAGE_DISTRIBUTION=testing $(basename $0) [src]install PACKAGE"
 	echo "Overrides stable packages; you can install packages that are marked testing."
 	echo
 	echo "NOCOLORS=true $(basename $0) [src]install PACKAGE"
@@ -396,7 +392,8 @@
 		;;
 
 	version)
-		showversion
+		# showversion
+		exit 0
 		;;
 
 	regen-mage-tree)