Use $HOME (not shell ~) and quote all variables.

1 files changed, 23 insertions, 23 deletions

diff --git a/localikiblogcreate b/localikiblogcreate
index 4d24381..ae61948 100755
--- a/localikiblogcreate
+++ b/localikiblogcreate
@@ -8,15 +8,15 @@
 
 set -e
 
-BLOGGITDIR=~/private_git/blog
-BLOGWORKDIR=~/private_webdata/blog
-BLOGWORKDIR=~/public_html
-BLOGPROTO=http
-BLOGHOST=user.homebase.dk
+BLOGGITDIR="$HOME/private_git/blog"
+BLOGWORKDIR="$HOME/private_webdata/blog"
+BLOGWORKDIR="$HOME/public_html"
+BLOGPROTO="http"
+BLOGHOST="user.homebase.dk"
 
 # The above can be overridden
-LOCALCONFIG=/etc/local/ikiblog.conf
-. $LOCALCONFIG || true
+LOCALCONFIG="/etc/local/ikiblog.conf"
+. "$LOCALCONFIG" || true
 
 gitdir="$BLOGGITDIR"
 workdir="$BLOGWORKDIR"
@@ -24,33 +24,33 @@ webdir="$BLOGWORKDIR"
 baseurl="$BLOGPROTO://$BLOGHOST/~$USER"
 
 # clone/create public repositories
-mkdir -p $gitdir
-git clone --bare git://source.jones.dk/ikiwiki/site $gitdir.git
-git init --bare $gitdir/content.git
+mkdir -p "$gitdir"
+git clone --bare git://source.jones.dk/ikiwiki/site "$gitdir.git"
+git init --bare "$gitdir/content.git"
 
 # clone/create private working repositories
-mkdir -p ~/private_data
-git clone --recursive $gitdir.git $workdir
-git clone $gitdir/content.git $workdir/content
+mkdir -p "$(dirname "$workdir")"
+git clone --recursive "$gitdir.git" "$workdir"
+git clone "$gitdir/content.git" "$workdir/content"
 
 # populate content
-cd $workdir/content
+cd "$workdir/content"
 rsync -av /usr/share/ikiwiki/examples/blog/ .
 git add .
 git commit -m "Initial commit, from sample blog."
 git push
 
 # redirect compiled blog to public folder
-mkdir -p $workdir/build
-ln -s $webdir $workdir/build/html
-ln -s $webdir $workdir/build/cgi
+mkdir -p "$workdir/build"
+ln -s "$webdir" "$workdir/build/html"
+ln -s "$webdir" "$workdir/build/cgi"
 
 # Customize settings and bootstrap
-echo "# IkiWiki::Setup::Yaml" > $workdir/config/ikiwiki.setup.in
-echo "url: $baseurl" >> $workdir/config/ikiwiki.setup.in
-echo "cgiurl: $baseurl/ikiwiki.cgi" >> $workdir/config/ikiwiki.setup.in
-echo "theme: goab" >> $workdir/config/ikiwiki.setup.in
-make -C $workdir init
+echo "# IkiWiki::Setup::Yaml" > "$workdir/config/ikiwiki.setup.in"
+echo "url: $baseurl" >> "$workdir/config/ikiwiki.setup.in"
+echo "cgiurl: $baseurl/ikiwiki.cgi" >> "$workdir/config/ikiwiki.setup.in"
+echo "theme: goab" >> "$workdir/config/ikiwiki.setup.in"
+make -C "$workdir" init
 
 # initialize blog
-make -C $workdir
+make -C "$workdir"