From f4e3fe9feb55aac77f1fe62c5e58c2d7f9b02702 Mon Sep 17 00:00:00 2001
From: Lisa Marie Maginnis <lisam@fsf.org>
Date: Tue, 27 Jan 2015 14:57:13 -0500
Subject: [PATCH] fixed scripts to copy more files

---
 scripts/IKIWIKI/10-ikiwiki.sh       | 2 ++
 scripts/IKIWIKI/20-setup-ikiwiki.sh | 7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/scripts/IKIWIKI/10-ikiwiki.sh b/scripts/IKIWIKI/10-ikiwiki.sh
index c7e596f..b959b6c 100755
--- a/scripts/IKIWIKI/10-ikiwiki.sh
+++ b/scripts/IKIWIKI/10-ikiwiki.sh
@@ -9,4 +9,6 @@ if ! $ROOTCMD test -e /home/ikiwiki/.ssh/id_rsa; then
     $ROOTCMD echo | $ROOTCMD sudo -u ikiwiki ssh-keygen -N ''
 fi
 
+# Configure for remote use 
 fcopy /home/ikiwiki/.ssh/config
+
diff --git a/scripts/IKIWIKI/20-setup-ikiwiki.sh b/scripts/IKIWIKI/20-setup-ikiwiki.sh
index 4465993..36696b2 100755
--- a/scripts/IKIWIKI/20-setup-ikiwiki.sh
+++ b/scripts/IKIWIKI/20-setup-ikiwiki.sh
@@ -1,10 +1,13 @@
 #!/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
 fi
+
+# Fix the local gitrepo
+fcopy /srv/ikiwiki/wiki.git/config
-- 
2.25.1