Einige Aenderungen an der make.sh.

Das war mal noetig.

git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@281 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8

diff --git a/doc/ChangeLog b/doc/ChangeLog
index 24af65e504582059bf3eb43bbbd32d84f94a51d6..1d88e1b4cd808343282b39a00299fa7eda3915a6 100644 (file)
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,4 +1,10 @@
 ------------------------------------------------------------------------
+r280 | delaco | 2006-09-17 15:03:38 +0200 (Sun, 17 Sep 2006) | 3 lines
+
+Geaendert:
+  * Sauber kompilierter und strukturierter Apache2
+    (Konfiguration fehlt aber noch.)
+------------------------------------------------------------------------
 r279 | delaco | 2006-09-14 22:51:06 +0200 (Thu, 14 Sep 2006) | 2 lines
 
 Fortschritt zur Migration auf Apache2.2

diff --git a/make.sh b/make.sh
index 086d2121a34fb001f64ad39b5fd0ef1a3996e4e3..6b886be62ab59540b71c49bbb0d0b7af4f8c802d 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@
   NAME="IPFire"                        # Software name
   SNAME="ipfire"                       # Short name
   VERSION="2.0"                        # Version number
-  SLOGAN="www.ipfire.org"              # Software slogan
+  SLOGAN="www.ipfire.eu"               # Software slogan
   CONFIG_ROOT=/var/ipfire              # Configuration rootdir
   NICE=10
   MAX_RETRIES=3                        # prefetch/check loop
@@ -1180,30 +1180,31 @@ svn)
        case "$2" in
          update|up)
                # clear
-               echo -n "Load the latest source files..."
-               svn update >> $PWD/log/_build.svn.update.log
+               echo "Loading the latest source files..."
+               svn update | tee -a $PWD/log/_build.svn.update.log
                if [ $? -eq 0 ]; then
-                       echo ".Done!"
+                       echo "Finished!"
                else
-                       echo ".Fail!"
+                       echo "Failure!"
                        exit 1
                fi
-               echo -n "Write the svn info to a file..."
+               echo -n "Writing the svn-info to a file..."
                svn info > $PWD/svn_status
                if [ "$?" -eq "0" ]; then
-                       echo ".Done!"
+                       echo ".Finished!"
                else
-                       echo ".Fail!"
+                       echo ".Failure!"
                        exit 1
                fi
                chmod 755 $0
-               tail log/_build.svn.update.log
                exit 0
          ;;
          commit|ci)
                clear
                if [ -e /sbin/yast ]; then
-                       $0 changelog
+                       if [ "`echo $SVN_REVISION | cut -c 3`" -eq "0" ]; then
+                               $0 changelog
+                       fi
                fi
                echo "Upload the changed files..."
                sleep 1
@@ -1241,7 +1242,7 @@ svn)
                        exit 1
                fi
          ;;
-         diff)
+         diff|di)
                echo -ne "Make a local diff to last svn revision..."
                svn diff > ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff
                if [ "$?" -eq "0" ]; then
@@ -1622,6 +1623,16 @@ batch)
                exit 0
        fi
        ;;
+watch)
+       echo "Exit with Ctrl+A, Ctrl+D."
+       echo -n "Preparing..."
+       for i in `seq 5`; do
+               sleep 0.1; echo -n "."
+       done
+       echo ".Ready!"
+       sleep 0.3
+       screen -x ipfire
+       ;;
 *)
        clear
        svn info
@@ -1635,14 +1646,7 @@ batch)
                $0 build-silent
                ;;
        "IPFIRE: Watch Build")
-               echo "Exit with Ctrl+A, Ctrl+D."
-               echo -n "Preparing..."
-               for i in `seq 10`; do
-                       sleep 0.1; echo -n "."
-               done
-               echo ".Ready!"
-               sleep 0.3
-               screen -x ipfire
+               $0 watch
                ;;
        "IPFIRE: Batch")
                $0 batch