From ad0c76aaea8f03f93a4e9d0a03bb4f33f299cf27 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 19 Jun 2011 14:31:29 +0000 Subject: [PATCH] Enhance debian package. --- build/deb/apache-cominclude.sh | 35 ---------------------- build/deb/apache-include.sh | 38 ------------------------ build/deb/apache-include_all.sh | 51 -------------------------------- build/deb/apache-uncominclude.sh | 35 ---------------------- 4 files changed, 159 deletions(-) delete mode 100644 build/deb/apache-cominclude.sh delete mode 100644 build/deb/apache-include.sh delete mode 100644 build/deb/apache-include_all.sh delete mode 100644 build/deb/apache-uncominclude.sh diff --git a/build/deb/apache-cominclude.sh b/build/deb/apache-cominclude.sh deleted file mode 100644 index ec6c292cc18..00000000000 --- a/build/deb/apache-cominclude.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# File: apache-cominclude.sh -# Changes: -# 20010219 Ola Lundqvist -# 20011022 Luca De Vitis -# Introduced the error variable. -# o /[[:space:]][[:space:]]*/[[:space:]]\+/ -# Changed from "cat $conffile | sed" to "sed ... < $conffile" -# 20020116 Ola Lundqvist -# Documented the error variable. -# Needs: $conffile - The file that should be modified. -# $includefile - The file that should be commented out. -# Description: Comments out a include statement. -# Sets: $status = {error, nothing, comment} -# $error = error message (if $status = error). - -status=error - -if [ -z "$conffile" ] ; then - error="No config file specified in apache-cominclude.sh" -elif [ -z "$includefile" ] ; then - error="No include file specified in apache-cominclude.sh" -elif [ ! -f $conffile ] ; then - error="File $conffile not found!" -elif [ ! -f $includefile ] ; then - error="File $includefile not found!" -else - status=nothing - if grep -e "^[[:space:]]*Include[[:space:]]\+$includefile\b" $conffile > /dev/null 2>&1; then - log="${log}Commenting import for $includefile in $conffile." - status=comment - sed -e "s#^\( *\)\(Include *$includefile\b\)#\1\#\2#" < $conffile > $conffile.new - mv $conffile.new $conffile - fi -fi diff --git a/build/deb/apache-include.sh b/build/deb/apache-include.sh deleted file mode 100644 index e32caa7925c..00000000000 --- a/build/deb/apache-include.sh +++ /dev/null @@ -1,38 +0,0 @@ -#!/bin/sh -# File: apache-include.sh -# Changes: -# 20010219 Ola Lundqvist -# 20011022 Luca De Vitis -# Introduced the error variable. -# o /[[:space:]][[:space:]]*/[[:space:]]\+/ -# 20020116 Ola Lundqvist -# Documented the error variable. -# Needs: $conffile - where the config file is. -# $includefile - what file that should not be included. -# /usr/share/wwwconfig-common/apache-uncominclude.sh -# Description: Includes a file in a apache config file. -# If it is not included (and commented) it will be added -# at the bottom of the file. -# Sets: $status = {error, nothing, include, uncomment} -# $error = error message (if $status = error). - -status=error -if [ -z "$conffile" ] ; then - error="No config file specified in apache-include.sh" -elif [ -z "$includefile" ] ; then - error="No include file specified in apache-include.sh" -elif [ ! -f $conffile ] ; then - error="File $conffile not found!" -elif [ ! -f $includefile ] ; then - error="File $includefile not found!" -else - status=nothing - . /usr/share/dolibarr/build/deb/apache-uncominclude.sh - if [ "$status" = "nothing" ] ; then - if ! grep -e "Include[[:space:]]\+$includefile\b" $conffile > /dev/null 2>&1; then - status=include - log="${log}Including $includefile in $conffile." - echo "Include $includefile" >> $conffile - fi - fi -fi diff --git a/build/deb/apache-include_all.sh b/build/deb/apache-include_all.sh deleted file mode 100644 index 7f76e895d83..00000000000 --- a/build/deb/apache-include_all.sh +++ /dev/null @@ -1,51 +0,0 @@ -#!/bin/sh -# File: apache-include_all.sh -# Changes: -# 20010219 Ola Lundqvist -# 20011022 Luca De Vitis -# Introduced the error variable. -# o /[[:space:]][[:space:]]*/[[:space:]]\+/ -# Reduced the 3 assignment in the function to a single sed -# script. -# 20020116 Ola Lundqvist -# Documented the error variable. -# 20020412 Ola Lundqvist -# Added check for if the server is installed. -# Needs: $server - what apache server that should be configured. -# That can be any matching /etc/$server/*.conf -# $includefile - what file that should not be included. -# /usr/share/wwwconfig-common/apache-uncominclude.sh -# /usr/share/wwwconfig-common/apache-include.sh -# Description: Includes a file in a apache config file. -# If it is not included (and commented) it will be added -# at the bottom of the file. -# It first checks for if any in the server -# Sets: $status = {error, nothing, uncomment, include} -# $error = error message (if $status = error). - -status=error - -if [ -z "$includefile" ] ; then - error="No include file specified for apache-include_all.sh." -elif [ ! -f $includefile ] ; then - error="Includefile $includefile not found in apache-include_all.sh." -elif [ ! -d /etc/$server ] ; then - error="No server $server installed, unable to configure it." -else - status=nothing - if grep -e "Include[[:space:]]\+$includefile" /etc/$server/*.conf > /dev/null 2>&1; then - lstatus=nothing - log="${log}Include of $includefile found in apache config files." - for conffile in /etc/$server/*.conf; do - . /usr/share/dolibarr/build/deb/apache-uncominclude.sh - if [ "$status" = "uncomment" ] ; then - lstatus=$status - fi - done - status=$lstatus - else - conffile=/etc/$server/httpd.conf - . /usr/share/dolibarr/build/deb/apache-include.sh - status=include - fi -fi diff --git a/build/deb/apache-uncominclude.sh b/build/deb/apache-uncominclude.sh deleted file mode 100644 index 192e2704f47..00000000000 --- a/build/deb/apache-uncominclude.sh +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/sh -# File: apache-uncominclude.sh -# Changes: -# 20010219 Ola Lundqvist -# 20011022 Luca De Vitis -# Introduced the error variable. -# o /[[:space:]][[:space:]]*/[[:space:]]\+/ -# Changed from "cat $conffile | sed" to "sed ... < $conffile" -# 20020116 Ola Lundqvist -# Documented the error variable. -# Needs: $conffile - The file that should be modified. -# $includefile - The file that should not be included. -# Description: Comments out a include statement. -# Sets: $status = {error, nothing, uncomment} -# $error = error message (if $status = error). - -status=error - -if [ -z "$conffile" ] ; then - error="No config file specified in apache-uncominclude.sh" -elif [ -z "$includefile" ] ; then - error="No include file specified in apache-uncominclude.sh" -elif [ ! -f $conffile ] ; then - error="File $conffile not found!" -elif [ ! -f $includefile ] ; then - error="File $includefile not found!" -else - status=nothing - if grep -e "^[[:space:]]*#[[:space:]]*Include[[:space:]]\+$includefile\b" $conffile > /dev/null 2>&1; then - log="${log}Uncommenting import for $includefile in $conffile" - status=uncomment - sed -e "s|^\([[:space:]]*\)#\([[:space:]]*Include[[:space:]][[:space:]]*$includefile\b\)|\1\2|g;" < $conffile > $conffile.new - mv $conffile.new $conffile - fi -fi