Projet

Général

Profil

Révision 364f9fdd

Ajouté par Julien Enselme il y a plus de 10 ans

Fix problems with sites.php and aliases.drushrc.php

The previous versions of these scripts rewrote both file without
any lines. Now the correct lines are written to the file.

Voir les différences:

bin/d7-create-site.sh
26 26
db_password=`ask_password_db $db_server $db_user`
27 27
site_password=`generate_password`
28 28
site_line_sites_php="\$sites['assos.centrale-marseille.fr.$d7_site_name'] = 'assos.centrale-marseille.fr.$d7_site_name';"
29
site_line_aliases_drushrc_php="\$aliases['$d7_site_name'] = array('uri' => 'assos.centrale-marseille.fr/$site_name', 'root' => '/users/guest/assos/htmltest/', );"
30
d7_line_aliases_drushrc_php="s/'site-list' => array(/'site-list' => array(%'assos.centrale-marseille.fr/$d7_site_name',/"
29
site_line_aliases_drushrc_php="\$aliases['$d7_site_name'] = array('uri' => 'assos.centrale-marseille.fr/$d7_site_name', 'root' => '/users/guest/assos/htmltest/', );"
31 30

  
32 31
# Check if site database already exists.
33 32
if mysql -h $db_server -u $db_user -e "USE $d7_site_name" -p$db_password 2>/dev/null ; then
......
69 68
ln -s . $d7_site_name
70 69

  
71 70
# Update sites.php
71
chmod +w $sites_php
72 72
echo $site_line_sites_php >> $sites_php
73
chmod 400 $sites_php
73 74

  
74 75
### Update aliases.drushrc.php
75 76
# For site
76 77
echo $site_line_aliases_drushrc_php >> $aliases_drushrc_php
77 78
# @d7
78
sed $d7_line_aliases_drushrc_php < $aliases_drushrc_php | tr '%' '\n' > $aliases_drushrc_php
79
sed s/"'site-list' => array("/"'site-list' => array(%'assos.centrale-marseille.fr\/$d7_site_name',"/ < $aliases_drushrc_php | tr '%' '\n    ' > $dir_tmp/aliases.tmp
80
mv $dir_tmp/aliases.tmp $aliases_drushrc_php
79 81

  
80 82
# Next Instructions
81 83
echo "Go to http://assos.centrale-marseille.fr/$d7_site_name/install.php to continue."
bin/d7-delete-site.sh
25 25

  
26 26
echo 'Remove site line from sites.php'
27 27
chmod +w $sites_php
28
grep -sv "^\$.*$d7_site_name';$" $sites_php > $sites_php
28
grep -sv "^\$.*$d7_site_name';$" $sites_php > $dir_tmp/sites.php
29
mv $dir_tmp/sites.php $sites_php
29 30
chmod 400 $sites_php
30 31

  
31 32
echo 'Remove site alias from aliases.drushrc.php'
32
grep -sv "$d7_site_name'" $aliases_drushrc_php > $aliases_drushrc_php
33
grep -sv "$d7_site_name'" $aliases_drushrc_php > $dir_tmp/aliases.php
34
mv $dir_tmp/aliases.php $aliases_drushrc_php
33 35

  
34 36
echo 'Delete database backups.'
35 37
rm -r $d7_dir_individual_auto_backup/assos.centrale-marseille.fr.$d7_site_name
bin/scripts-config.sh
17 17
dir_scripts="$dir_multi_assos/bin"
18 18
dir_template="$dir_multi_assos/template"
19 19
dir_private="$dir_multi_assos/private"
20
dir_tmp="$dir_multi_assos/tmp"
20 21

  
21 22
###### Aliases
22 23
### Bash

Formats disponibles : Unified diff