From caa26c1199346ab77c034cc97d40236bc4c9d027 Mon Sep 17 00:00:00 2001
From: alvaro <alvaro@alia.(none)>
Date: Wed, 29 Feb 2012 16:02:02 -0800
Subject: [PATCH] Again

---
 install.sh    | 7 +++++--
 utils/install | 4 +---
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/install.sh b/install.sh
index 7426c096..08bdc17e 100755
--- a/install.sh
+++ b/install.sh
@@ -113,8 +113,11 @@ echo "Created new configuration file: $settings_file"
 echo ""
 echo "WARNING: Copying $root_htaccess as .htaccess in parent directory"
 echo ""
-cp $root_htaccess $parent_htaccess
-
+echo "RewriteEngine on" > $parent_htaccess
+echo >> $parent_htaccess
+echo "RewriteRule ^\$ $1/index.php [L]" >> $parent_htaccess
+cat $root_htaccess >> $parent_htaccess
+echo "RewriteRule ^(.+)\$ $lodspeakr_dir/index.php?q=\$1 [L]" >> $parent_htaccess
 mkdir cache
 
 echo
diff --git a/utils/install b/utils/install
index 48986405..d07f57de 100644
--- a/utils/install
+++ b/utils/install
@@ -19,8 +19,6 @@ if [ ! -e "$home" ]; then
    $GIT clone $lodspeakr_repository
    cd $home
    ./install.sh $lodspeakr_dir
-   cd ..
-   echo "RewriteRule ^(.+)\$ $lodspeakr_dir/index.php?q=\$1 [L]" >> .htaccess
-else
+ else
    echo "There is already an existing directory called '$home'. Installation cancelled. Remove it first and try again."
 fi
-- 
GitLab