Project

General

Profile

Revision a629a580

Added by Benjamin Luce about 9 years ago

Correct import of scripts-config-site.sh

Close #531

View differences:

bin/d7-create-site.sh
49 49

  
50 50

  
51 51
. /home/assos/bin/scripts-config.sh
52
. /home/assos/bin/scripts-config-site.sh "${site_name}"
52
param="${site_name}" . /home/assos/bin/scripts-config-site.sh
53 53
. /home/assos/bin/scripts-utils.sh
54 54

  
55 55
# Check if site already exists.
bin/d7-delete-site.sh
21 21
shift $((OPTIND-1))
22 22

  
23 23
. /home/assos/bin/scripts-config.sh
24
. scripts-config-site.sh "${site_name}"
24
param="${site_name}" . scripts-config-site.sh
25 25
. scripts-utils.sh
26 26

  
27 27
echo 'Awaiting for git status. (may take a while)'
bin/d7-reset-variables.sh
5 5
# ARGS: [site_name]
6 6

  
7 7
if [ -n "$1" ] ; then
8
    . scripts-config-site.sh "$1"
8
    param="$1" . scripts-config-site.sh
9 9
    # default is an exception to the rule
10 10
    if echo "$1" | grep -q default ; then
11 11
	    cd "${d7_dir_sites}/default"
bin/scripts-config-site.sh
11 11
    exit 1
12 12
fi
13 13

  
14
if [ -z "$1" ] ; then
14
if [ -z "${param}" ] ; then
15 15
    echo "This script needs a site name as argument."
16 16
    exit 1
17 17
fi
18 18

  
19 19
scripts_config_site='imported'
20 20

  
21
d7_site_name="$1"
21
d7_site_name="${param}"
22 22
d7_site_dir="${d7_dir_sites}/assos.centrale-marseille.fr.${d7_site_name}"
23 23
d7_site_settings="${d7_site_dir}/settings.php"
24 24
d7_site_settings_local="${d7_site_dir}/settings.local.php"

Also available in: Unified diff