HinzugefĆ¼gt:
authorms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Tue, 25 Jul 2006 16:32:37 +0000 (16:32 +0000)
committerms <ms@ea5c0bd1-69bd-2848-81d8-4f18e57aeed8>
Tue, 25 Jul 2006 16:32:37 +0000 (16:32 +0000)
  * Neue Routinen in der ./make.sh

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

make.sh
tools/perfTest.sh

diff --git a/make.sh b/make.sh
index cbf3fa2..a237527 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="We secure your network"      # Software slogan
+  SLOGAN="www.ipfire.org"              # Software slogan
   CONFIG_ROOT=/var/ipfire              # Configuration rootdir
   NICE=10
   MAX_RETRIES=3                        # prefetch/check loop
@@ -1230,7 +1230,7 @@ build-only)
        svn info
        #echo "Usage: $0 {build|changelog|check|checkclean|clean|commit|diff|dist|gettoolchain|make|newpak|prefetch|pub-iso|pub-paks|shell|sync|toolchain|update}"
        #cat doc/make.sh-usage
-       select name in "End" "Build IPFire" "Prefetch" "Create Diff" "Get Toolchain" "Update SVN Version" "Sync to Server" "Show last log lines"
+       select name in "End" "Build IPFire (silent)" "Watch IPFire Build" "Prefetch" "Create Diff" "Get Toolchain" "Update SVN Version" "Sync To Server" "Show Last Log Lines" "Make Clean"
        do
        case $name in
         "Update SVN Version")
@@ -1245,21 +1245,32 @@ build-only)
                 echo "### MAKE.SH DIFF ###"
                 $0 diff
                 ;;
-        "Build IPFire")
+        "Build IPFire (silent)")
                 echo "### MAKE.SH BUILD ###"
-                $0 build
+                screen -dmS ipfire $0 build
+                echo "You can see the status with 'screen -x ipfire'."
                 ;;
         "Get Toolchain")
                 echo "### MAKE.SH GETTOOLCHAIN ###"
                 $0 gettoolchain
                 ;;
        "Sync to Server")
-               echo "svn commit"
-               svn commit
-               ;;
+                 echo "svn commit"
+                 svn commit
+                 ;;
        "Show last log lines")
-               tail log/_*
-               ;;
+                 tail log/_*
+                 ;;
+       "Watch IPFire Build")
+                echo "### MAKE.SH BUILD ###"
+                echo "Exit with Ctrl+A, Ctrl+D."
+                sleep 1
+                screen -x ipfire
+                ;;
+       "Make Clean")
+                echo "### MAKE.SH CLEAN ###"
+                $0 clean
+                ;;
         "End")
                 break
                 ;;
index c9140ac..ba7b275 100644 (file)
@@ -1,84 +1,84 @@
-#!/bin/bash\r
-#\r
-############################################################################\r
-#                                                                          #\r
-# This file is part of the IPCop Firewall.                                 #\r
-#                                                                          #\r
-# IPCop is free software; you can redistribute it and/or modify            #\r
-# it under the terms of the GNU General Public License as published by     #\r
-# the Free Software Foundation; either version 2 of the License, or        #\r
-# (at your option) any later version.                                      #\r
-#                                                                          #\r
-# IPCop is distributed in the hope that it will be useful,                 #\r
-# but WITHOUT ANY WARRANTY; without even the implied warranty of           #\r
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #\r
-# GNU General Public License for more details.                             #\r
-#                                                                          #\r
-# You should have received a copy of the GNU General Public License        #\r
-# along with IPCop; if not, write to the Free Software                     #\r
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #\r
-#                                                                          #\r
-# Copyright (C) 2005 Mark Wormgoor <mark@wormgoor.com>.                    #\r
-#                                                                          #\r
-############################################################################\r
-#\r
-# $Id: perfTest.sh,v 1.1.2.1 2005/01/26 19:43:36 riddles Exp $\r
-#\r
-# This script will do a get request for all links on an IPCop box.\r
-# You can time this using:\r
-#      time ./perfTest.sh\r
-#\r
-# This will give you a basic idea of the speed of your IPCop machine\r
-# and will make it possible for you to test new updates for performance.\r
-# With just network overhead on a sufficiently fast machine, expect \r
-# something around 5 seconds for the entire test.\r
-#\r
-## Basic settings\r
-CGI_HOST=192.168.1.1\r
-CGI_PORT=445\r
-CGI_URL="https://$CGI_HOST:$CGI_PORT/cgi-bin"\r
-USER=admin\r
-PASS=password\r
-CMD="wget -q -O /dev/null --http-user=$USER --http-passwd=$PASS"\r
-\r
-doTest() {\r
-       $CMD $CGI_URL/aliases.cgi\r
-       $CMD $CGI_URL/backup.cgi\r
-       $CMD $CGI_URL/changepw.cgi\r
-       $CMD $CGI_URL/connections.cgi\r
-       $CMD $CGI_URL/credits.cgi\r
-       $CMD $CGI_URL/ddns.cgi\r
-       $CMD $CGI_URL/dhcp.cgi\r
-       $CMD $CGI_URL/dial.cgi\r
-       $CMD $CGI_URL/dmzholes.cgi\r
-       $CMD $CGI_URL/graphs.cgi\r
-       $CMD $CGI_URL/gui.cgi\r
-       $CMD $CGI_URL/hosts.cgi\r
-       $CMD $CGI_URL/ids.cgi\r
-       $CMD $CGI_URL/index.cgi\r
-       $CMD $CGI_URL/ipinfo.cgi\r
-       $CMD $CGI_URL/modem.cgi\r
-       $CMD $CGI_URL/netstatus.cgi\r
-       $CMD $CGI_URL/portfw.cgi\r
-       $CMD $CGI_URL/pppsetup.cgi\r
-       $CMD $CGI_URL/proxy.cgi\r
-       $CMD $CGI_URL/proxygraphs.cgi\r
-       $CMD $CGI_URL/remote.cgi\r
-       $CMD $CGI_URL/shaping.cgi\r
-       $CMD $CGI_URL/shutdown.cgi\r
-       $CMD $CGI_URL/status.cgi\r
-       $CMD $CGI_URL/time.cgi\r
-       $CMD $CGI_URL/updates.cgi\r
-       $CMD $CGI_URL/upload.cgi\r
-       $CMD $CGI_URL/vpnmain.cgi\r
-       $CMD $CGI_URL/wireless.cgi\r
-       $CMD $CGI_URL/xtaccess.cgi\r
-       $CMD $CGI_URL/logs.cgi/config.dat\r
-       $CMD $CGI_URL/logs.cgi/firewalllog.dat\r
-       $CMD $CGI_URL/logs.cgi/ids.dat\r
-       $CMD $CGI_URL/logs.cgi/log.dat\r
-       $CMD $CGI_URL/logs.cgi/proxylog.dat\r
-       $CMD $CGI_URL/logs.cgi/summary.dat\r
-}\r
-\r
-doTest\r
+#!/bin/bash
+#
+############################################################################
+#                                                                          #
+# This file is part of the IPCop Firewall.                                 #
+#                                                                          #
+# IPCop is free software; you can redistribute it and/or modify            #
+# it under the terms of the GNU General Public License as published by     #
+# the Free Software Foundation; either version 2 of the License, or        #
+# (at your option) any later version.                                      #
+#                                                                          #
+# IPCop is distributed in the hope that it will be useful,                 #
+# but WITHOUT ANY WARRANTY; without even the implied warranty of           #
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the            #
+# GNU General Public License for more details.                             #
+#                                                                          #
+# You should have received a copy of the GNU General Public License        #
+# along with IPCop; if not, write to the Free Software                     #
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
+#                                                                          #
+# Copyright (C) 2005 Mark Wormgoor <mark@wormgoor.com>.                    #
+#                                                                          #
+############################################################################
+#
+# $Id: perfTest.sh,v 1.1.2.1 2005/01/26 19:43:36 riddles Exp $
+#
+# This script will do a get request for all links on an IPCop box.
+# You can time this using:
+#      time ./perfTest.sh
+#
+# This will give you a basic idea of the speed of your IPCop machine
+# and will make it possible for you to test new updates for performance.
+# With just network overhead on a sufficiently fast machine, expect 
+# something around 5 seconds for the entire test.
+#
+## Basic settings
+CGI_HOST=192.168.0.100
+CGI_PORT=444
+CGI_URL="https://$CGI_HOST:$CGI_PORT/cgi-bin"
+USER=admin
+PASS=test
+CMD="wget -q -O /dev/null --http-user=$USER --http-passwd=$PASS"
+
+doTest() {
+       $CMD $CGI_URL/aliases.cgi
+       $CMD $CGI_URL/backup.cgi
+       $CMD $CGI_URL/changepw.cgi
+       $CMD $CGI_URL/connections.cgi
+       $CMD $CGI_URL/credits.cgi
+       $CMD $CGI_URL/ddns.cgi
+       $CMD $CGI_URL/dhcp.cgi
+       $CMD $CGI_URL/dial.cgi
+       $CMD $CGI_URL/dmzholes.cgi
+       $CMD $CGI_URL/graphs.cgi
+       $CMD $CGI_URL/gui.cgi
+       $CMD $CGI_URL/hosts.cgi
+       $CMD $CGI_URL/ids.cgi
+       $CMD $CGI_URL/index.cgi
+       $CMD $CGI_URL/ipinfo.cgi
+       $CMD $CGI_URL/modem.cgi
+       $CMD $CGI_URL/netstatus.cgi
+       $CMD $CGI_URL/portfw.cgi
+       $CMD $CGI_URL/pppsetup.cgi
+       $CMD $CGI_URL/proxy.cgi
+       $CMD $CGI_URL/proxygraphs.cgi
+       $CMD $CGI_URL/remote.cgi
+       $CMD $CGI_URL/shaping.cgi
+       $CMD $CGI_URL/shutdown.cgi
+       $CMD $CGI_URL/status.cgi
+       $CMD $CGI_URL/time.cgi
+       $CMD $CGI_URL/updates.cgi
+       $CMD $CGI_URL/upload.cgi
+       $CMD $CGI_URL/vpnmain.cgi
+       $CMD $CGI_URL/wireless.cgi
+       $CMD $CGI_URL/xtaccess.cgi
+       $CMD $CGI_URL/logs.cgi/config.dat
+       $CMD $CGI_URL/logs.cgi/firewalllog.dat
+       $CMD $CGI_URL/logs.cgi/ids.dat
+       $CMD $CGI_URL/logs.cgi/log.dat
+       $CMD $CGI_URL/logs.cgi/proxylog.dat
+       $CMD $CGI_URL/logs.cgi/summary.dat
+}
+
+doTest