Merge branch 'master' of vcs.fsf.org:fai-configs

[fai-configs.git] / scripts / IKIWIKI / 20-setup-ikiwiki.sh

diff --git a/scripts/IKIWIKI/20-setup-ikiwiki.sh b/scripts/IKIWIKI/20-setup-ikiwiki.sh
old mode 100644 (file)
new mode 100755 (executable)
index 4465993..914b829
--- a/scripts/IKIWIKI/20-setup-ikiwiki.sh
+++ b/scripts/IKIWIKI/20-setup-ikiwiki.sh
@@ -1,10 +1,14 @@
 #!/bin/sh
 
 # Detect if ikikwiki is already installed
-if [ ! -e /etc/ikiwiki/ikiwiki.setup ]; then
+if ! $ROOTCMD test -e /etc/ikiwiki/ikiwiki.setup ; then
  # copy ikiwiki config
  fcopy -v /etc/ikiwiki/ikiwiki.setup
 
  # run setup
- $ROOTCMD ikiwiki --setup /etc/ikiwiki/auto.setup/DEFAULT
+ $ROOTCMD sudo -u ikiwiki ikiwiki --setup /etc/ikiwiki/ikiwiki.setup
+ # Fix the local gitrepo
+  $ROOTCMD sudo -u ikiwiki ikiwiki git clone git@vcs.fsf.org:gluestick.git
 fi
+
+