From 8fc2cdd6b0175cdb624fe64b37c55069b4f4be7c Mon Sep 17 00:00:00 2001 From: Michael Tremer Date: Wed, 9 Apr 2008 23:29:30 +0200 Subject: [PATCH] Removed deletion of the old .svn-subdirectories. --- lfs/apache2 | 2 -- lfs/initrd | 1 - lfs/mldonkey | 1 - lfs/pakfire | 1 - lfs/squid | 1 - tools/check_langs.sh | 1 - 6 files changed, 7 deletions(-) diff --git a/lfs/apache2 b/lfs/apache2 index 4ffe1216d9..309e0f24f2 100644 --- a/lfs/apache2 +++ b/lfs/apache2 @@ -82,13 +82,11 @@ ifeq "$(PASS)" "C" cp -rf $(DIR_CONF)/httpd/* /etc/httpd/conf ln -sf $(CONFIG_ROOT)/main/hostname.conf /etc/httpd/conf/ - -find /etc/httpd/conf -name .svn -exec rm -rf {} \; # Copy all html/cgi-bin files mkdir -p /srv/web/ipfire/{cgi-bin,html} mkdir -p /var/updatecache/{download,metadata} cp -aR $(DIR_SRC)/html/* /srv/web/ipfire - -find /srv/web/ipfire -name .svn -exec rm -rf {} \; # Change CONFIG_ROOT in cgi-scripts for i in /srv/web/ipfire/cgi-bin/{*,logs.cgi/*,vpn.cgi/*}; do \ diff --git a/lfs/initrd b/lfs/initrd index a4aa83fb94..8353477dd4 100644 --- a/lfs/initrd +++ b/lfs/initrd @@ -54,7 +54,6 @@ $(TARGET) : -mkdir -p /install/initrd/{dev,etc,mnt,root,lib/modules/$(KVER)-ipfire/kernel/drivers,cdrom,dev,harddisk,proc,tmp,usr/share/terminfo/l,var/run,sys} && \ cd /install/initrd/etc && rm -f fstab cp -aRf $(DIR_SRC)/config/install/* /install/initrd/etc/ - rm -rf /install/initrd/etc{,/udev,/udev/rules.d}/.svn rm -rf /install/initrd/usr/share/man chmod 755 /install/initrd/etc/halt /install/initrd/etc/rc cp -f /usr/share/terminfo/l/linux /install/initrd/usr/share/terminfo/l diff --git a/lfs/mldonkey b/lfs/mldonkey index 6d59aa6951..bef1215ea8 100644 --- a/lfs/mldonkey +++ b/lfs/mldonkey @@ -85,7 +85,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cd $(DIR_APP) && cp -f mlnet /opt/mldonkey cd $(DIR_APP) && cp -rf distrib/* /opt/mldonkey cp -rf $(DIR_CONF)/mldonkey/* /opt/mldonkey/.mldonkey - -find /opt/mldonkey -name .svn -exec rm -rf {} \; chown -Rv mldonkey.mldonkey /opt/mldonkey -mkdir -p /var/log/mldonkey/{incoming,temp} -mkdir -p /var/log/mldonkey/incoming/{directories,files} diff --git a/lfs/pakfire b/lfs/pakfire index cc9eac8293..b55c89f285 100644 --- a/lfs/pakfire +++ b/lfs/pakfire @@ -56,7 +56,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) chown root.root $(DIR_APP) -R chmod 755 $(DIR_APP)/pakfire - -cd $(DIR_APP) && find $(DIR_APP) -name .svn -exec rm -rf {} \; ln -sf ../../opt/pakfire/pakfire /etc/fcron.daily/pakfire-update touch /var/log/pakfire.log diff --git a/lfs/squid b/lfs/squid index 7b47c2339b..f5d06769a0 100644 --- a/lfs/squid +++ b/lfs/squid @@ -105,7 +105,6 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) cp -f $(DIR_SRC)/config/updxlrator/download /var/ipfire/updatexlrator/bin/download -mkdir -p /usr/lib/squid/errors.ipfire cp -fr $(DIR_SRC)/config/proxy/errors.ipfire/* /usr/lib/squid/errors.ipfire/ - -find /usr/lib/squid/errors.ipfire/ -name .svn -exec rm -rf {} \; chmod 755 /usr/sbin/updxlrator /var/ipfire/updatexlrator/bin/checkup \ /var/ipfire/updatexlrator/bin/download diff --git a/tools/check_langs.sh b/tools/check_langs.sh index 66f4693bce..cb7340922f 100644 --- a/tools/check_langs.sh +++ b/tools/check_langs.sh @@ -29,7 +29,6 @@ cat ./langs/de/cgi-bin/de.pl | grep \'.*\' | awk -F\' '{print $2}'| sort > /tmp/ cat ./langs/de/install/lang_de.c | grep TR_ | awk -F\ '{print $2}' > /tmp/de_install.$$ for i in ./langs/en; do - if [ "$i" == "./langs/.svn" ] ; then continue; fi language=`echo "$i" | awk -F/ '{ print $3 }'` echo "############################################################################" -- 2.39.2