Calamaris-Proxy-Logdatei-Analyzer eingebaut.

[people/pmueller/ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 849fb7de8968f7395ea98a9297fb804298771096..3fd133fc166a32b3b21a79758f3f68bddca3705a 100644 (file)
--- a/make.sh
+++ b/make.sh
@@ -464,6 +464,7 @@ buildipfire() {
   ipfiremake squid
   ipfiremake squid-graph
   ipfiremake squidguard
+  ipfiremake calamaris
   ipfiremake tcpdump
   ipfiremake traceroute
   ipfiremake vlan
@@ -533,7 +534,10 @@ buildipfire() {
   ipfiremake ethereal
   ipfiremake tftp-hpa
   ipfiremake iptraf
+  ipfiremake bwm-ng
   ipfiremake nagios
+  ipfiremake tripwire
+  ipfiremake sysstat
 }
 
 buildinstaller() {
@@ -602,7 +606,7 @@ buildpackages() {
   beautify message DONE
 
   # Create images for install
-  if [ ! -e ipfire-$VERSION.i586-devel.iso ]; then
+  if [ "$DEVEL" == "1" ]; then
                ipfiremake cdrom ED=devel
        fi
        ipfiremake cdrom ED=full
@@ -944,10 +948,12 @@ svn)
                evaluate 1
          ;;
          diff|di)
+         update_langs
                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
                evaluate 1
                echo "Diff was successfully saved to ipfire-diff-`date +'%Y-%m-%d-%H:%M'`-r`svn info | grep Revision | cut -c 11-`.diff"
+               svn status
          ;;
        esac
        ;;
@@ -1053,6 +1059,9 @@ pxe)
        esac
        exit 0
        ;;
+lang)
+       update_langs
+       ;;
 "")
        clear
        svn info