Changeset 5820

Timestamp:

2010-12-23 11:54:38 (2 years ago)

Author:

mpo

Message:

suggested fixes to upgrade-app.sh in the daisy package
makes it do well with relative paths #838 and space-paths #837

File:

• trunk/daisy/tools/daisy-maven-plugin/src/main/resources/org/outerj/daisy/maven/plugin/scripts/upgrade-app.sh (modified) (3 diffs)

trunk/daisy/tools/daisy-maven-plugin/src/main/resources/org/outerj/daisy/maven/plugin/scripts/upgrade-app.sh

@@ -27 +27 @@
 [ -z "$1" ] && error "I need at least one argument"
 
-app=$1
+app=$(cd $1 && pwd);
+
 currVerFile=$app/package.version
 read currVer < $currVerFile
@@ -52 +53 @@
 
 echo "Files to delete before copying new package:"
-(cd $oldpack/repodata && find . -type f | xargs -n1 -I {} bash -c "test -f ${app}/repodata/{} && echo rm ${app}/repodata/{}")
-(cd $oldpack/wikidata && find . -type f | xargs -n1 -I {} bash -c "test -f ${app}/wikidata/{} && echo rm ${app}/wikidata/{}")
+(cd $oldpack/repodata && find . -type f | xargs -n1 -I {} bash -c "test -f '${app}/repodata/{}' && echo rm \'${app}/repodata/{}\'")
+(cd $oldpack/wikidata && find . -type f | xargs -n1 -I {} bash -c "test -f '${app}/wikidata/{}' && echo rm \'${app}/wikidata/{}\'")
 echo "I will remove the files listed above before copying the new package"
 echo "Is this okay? (type 'this is okay' to continue)"
@@ -61 +62 @@
 
 echo "Removing old repodata and wikidata files"
-(cd $oldpack/repodata && find . -type f | xargs -n1 -I {} bash -c "test -f ${app}/repodata/{} && echo rm ${app}/repodata/{}")|sh
-(cd $oldpack/wikidata && find . -type f | xargs -n1 -I {} bash -c "test -f ${app}/wikidata/{} && echo rm ${app}/wikidata/{}")|sh
+(cd $oldpack/repodata && find . -type f | xargs -n1 -I {} bash -c "test -f '${app}/repodata/{}' && echo rm \'${app}/repodata/{}\'")|sh
+(cd $oldpack/wikidata && find . -type f | xargs -n1 -I {} bash -c "test -f '${app}/wikidata/{}' && echo rm \'${app}/wikidata/{}\'")|sh
 
 echo "Copying new repodata and wikidata files"