Changeset 678

Timestamp:

02/22/06 01:30:51 (7 years ago)

Author:

anarcat

Message:

[project @ alternc: changeset 2005-05-24 17:27:38 by anarcat]
enlever la plupart des incantations inutiles de cat

Original author: anarcat
Date: 2005-05-24 17:27:38

File:

• src/do_domaines.sh (modified) (8 diffs)

src/do_domaines.sh

@@ -1 +1 @@
 #!/bin/ksh
 #
-# $Id: do_domaines.sh,v 1.17 2005/05/24 17:13:36 anarcat Exp $
+# $Id: do_domaines.sh,v 1.18 2005/05/24 17:27:38 anarcat Exp $
 # ----------------------------------------------------------------------
 # AlternC - Web Hosting System
@@ -307 +307 @@
         if ! [ -f $NAMED_MASTER/$1 ] ; then
                 SERIAL=`$date +%Y%m%d`00
-                $cat $NAMED_MASTER/$NAMED_TPL | $sed s/"@@DOMAINE@@"/"${1}"/g | $sed s/"@@SERIAL@@"/$SERIAL/g > $NAMED_MASTER/"${1}"
+                $sed s/"@@DOMAINE@@"/"${1}"/g | $sed s/"@@SERIAL@@"/$SERIAL/g > $NAMED_MASTER/"${1}" < $NAMED_MASTER/$NAMED_TPL
                 $cp -f $NAMED_ETC/$NAMED_CONF $NAMED_ETC/$NAMED_CONF.prec
-                $cat $NAMED_ETC/$NAMED_TPL | $sed s/"@@DOMAINE@@"/"${1}"/g >> $NAMED_ETC/$NAMED_CONF
+                $sed s/"@@DOMAINE@@"/"${1}"/g >> $NAMED_ETC/$NAMED_CONF < $NAMED_ETC/$NAMED_TPL
                 $cp -f $BIND2_ROOT/$SECONDARY_LIST $BIND2_ROOT/$SECONDARY_LIST.prec
-                $cat $BIND2_ROOT/$NAMED_TPL | $sed s/"@@DOMAINE@@"/"${1}"/g >> $BIND2_ROOT/$SECONDARY_LIST
+                $sed s/"@@DOMAINE@@"/"${1}"/g >> $BIND2_ROOT/$SECONDARY_LIST < $BIND2_ROOT/$NAMED_TPL
                 RESTART_NAMED="true"
         fi
@@ -326 +326 @@
         if [ -f $NAMED_MASTER/$1 ] ; then
                 $rm -f $NAMED_MASTER/"$1"
-                $cat $NAMED_ETC/$NAMED_CONF | $grep -v "\"$1\"" > $NAMED_ETC/$NAMED_CONF.tmp
+                $grep -v "\"$1\"" > $NAMED_ETC/$NAMED_CONF.tmp < $NAMED_ETC/$NAMED_CONF
                 $cp -f $NAMED_ETC/$NAMED_CONF $NAMED_ETC/$NAMED_CONF.prec
                 $mv -f $NAMED_ETC/$NAMED_CONF.tmp $NAMED_ETC/$NAMED_CONF
-                $cat $BIND2_ROOT/$SECONDARY_LIST | $grep -v "\"$1\"" > $BIND2_ROOT/$SECONDARY_LIST.tmp
+                $grep -v "\"$1\"" > $BIND2_ROOT/$SECONDARY_LIST.tmp < $BIND2_ROOT/$SECONDARY_LIST
                 $cp -f $BIND2_ROOT/$SECONDARY_LIST $BIND2_ROOT/$SECONDARY_LIST.prec
                 $mv -f $BIND2_ROOT/$SECONDARY_LIST.tmp $BIND2_ROOT/$SECONDARY_LIST
@@ -351 +351 @@
 
     # regénérer la ligne MX correct du template
-    $cat $NAMED_MASTER/$NAMED_MX_TPL | $sed s/"@@MX@@"\.\*/"${2}"\./g >> "$NAMED_MASTER/${1}.tmp"
+    $sed s/"@@MX@@"\.\*/"${2}"\./g >> "$NAMED_MASTER/${1}.tmp" < $NAMED_MASTER/$NAMED_MX_TPL
 
     # le nombre de lignes total du fichier
@@ -393 +393 @@
                 $mv -f $BIND2_ROOT/$SECONDARY_LIST $BIND2_ROOT/$SECONDARY_LIST.prec
                 for i in `$cat $FIC_TMP` ; do
-                        $cat $BIND2_ROOT/$NAMED_TPL | $sed s/"@@DOMAINE@@"/"${i}"/g >> $BIND2_ROOT/$SECONDARY_LIST
+                        $sed s/"@@DOMAINE@@"/"${i}"/g >> $BIND2_ROOT/$SECONDARY_LIST < $BIND2_ROOT/$NAMED_TPL
                 done
         fi
@@ -448 +448 @@
 
                 # On traite les domaines
-                $cat $FIC_TMP | $sed s/"        "/"@"/g > $FIC_TMP.tmp
+                $sed s/"        "/"@"/g > $FIC_TMP.tmp < $FIC_TMP
                 $mv -f $FIC_TMP.tmp $FIC_TMP
                 
-                if [ `$cat $FIC_TMP | $wc -l | $awk {'print $1'}` -gt 0 ] ; then
+                if [ `$wc -l | $awk {'print $1'} < $FIC_TMP` -gt 0 ] ; then
                         $echo `$date` >> $FIC_LOG
                         $cat $FIC_TMP >> $FIC_LOG
@@ -510 +510 @@
 
                 # on traite les sous-domaines
-                $cat $FIC_TMP_SUB | $sed s/"    "/"@"/g > $FIC_TMP_SUB.tmp
+                $sed s/"        "/"@"/g > $FIC_TMP_SUB.tmp < $FIC_TMP_SUB
                 $mv -f $FIC_TMP_SUB.tmp $FIC_TMP_SUB
         
-                if [ `$cat $FIC_TMP_SUB | $wc -l | $awk {'print $1'}` -gt 0 ] ; then
+                if [ `$wc -l | $awk {'print $1'} < $FIC_TMP_SUB` -gt 0 ] ; then
                         $echo `$date` >> $FIC_LOG_SUB
                         $cat $FIC_TMP_SUB >> $FIC_LOG_SUB
@@ -547 +547 @@
                 # C'est un patch pour éviter que les users ne puissent utiliser opendir()
                 # pour voir/modifier les autres comptes que le leur.
-                for i in `$cat $FIC_TMP_OVERRIDE_PHP | $sort -u` ; do
+                for i in `$sort -u < $FIC_TMP_OVERRIDE_PHP` ; do
                         domain=`$echo "$i" | $cut -d"@" -f1`
                         /usr/lib/alternc/basedir_prot.sh "$domain" > /dev/null