diff options
| author | drebs <drebs@riseup.net> | 2010-02-14 22:51:54 -0200 |
|---|---|---|
| committer | drebs <drebs@riseup.net> | 2010-02-14 22:51:54 -0200 |
| commit | 0c10b6450c024c1a765eb9c882c359506b396454 (patch) | |
| tree | 73ccc16d4b701ead4dbe1b0a82ff1464611ea1bd /templates | |
| parent | 047f247fc9683adee57ee3aefdfdc472d9131b46 (diff) | |
| download | puppet-pmwiki-0c10b6450c024c1a765eb9c882c359506b396454.tar.gz puppet-pmwiki-0c10b6450c024c1a765eb9c882c359506b396454.tar.bz2 | |
Fixing some paths on wiki upgrade.
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/pmwiki.sh.erb | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/templates/pmwiki.sh.erb b/templates/pmwiki.sh.erb index c9298ca..e22870b 100644 --- a/templates/pmwiki.sh.erb +++ b/templates/pmwiki.sh.erb @@ -8,7 +8,7 @@ BASE="<%= apache_www_folder %>" # Check for existing installations function pmwiki_check_existing { if [ -e "$BASE/pmwiki-$1" ]; then - echo "Folder $BASE/pmwiki-$1 already exist, skipping" + echo "Folder $BASE/pmwiki-$1 already exists, skipping." exit 1 fi } @@ -54,12 +54,9 @@ function pmwiki_upgrade { pmwiki_deploy $new # Copy files - for file in .htaccess index.php farmconfig.php local config.php; do + for file in .htaccess index.php farmconfig.php local config.php wiki.d; do if [ -f "pmwiki-$old/$file" ]; then - cp pmwiki-$old/$file pmwiki-$new/ - fi - if [ -f "pmwiki-$old/local/$file" ]; then - cp pmwiki-$old/local/$file pmwiki-$new/local/ + cp -a pmwiki-$old/$file pmwiki-$new/ fi done for extra_folder in $extra_folders; do |