From 8c457e602d1747060942e7c800aae577d0ae04ed Mon Sep 17 00:00:00 2001
From: alvaro <alvaro@alia.(none)>
Date: Wed, 29 Feb 2012 15:56:18 -0800
Subject: [PATCH] Fixed problems with installation

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

diff --git a/install.sh b/install.sh
index 1c142215..7426c096 100755
--- a/install.sh
+++ b/install.sh
@@ -120,13 +120,13 @@ mkdir cache
 echo
 echo "                                      *** ATTENTION ***"
 echo
-echo "LODSPeaKr needs the web server to have write permissions for lodspeakr/cache/ and lodspeakr/meta/."
+echo "LODSPeaKr needs the web server to have write permissions for $1/cache/ and $1/meta/."
 echo
 echo
 echo "Common ways of doing this:"
-echo " chown -R www-apache lodspeakr/cache lodspeakr/meta (find the name of the apache user in your system)"
-echo " chmod -R g+w lodspeakr/cache lodspeakr/meta (if you have a group in common with the apache user)"
-echo " chmod -R 777 lodspeakr/cache lodspeakr/meta (highly discouraged but useful to test when everything fails. It shouldn't be used in production sites)"
+echo " chown -R www-apache $1/cache $1/meta (find the name of the apache user in your system)"
+echo " chmod -R g+w $1/cache $1/meta (if you have a group in common with the apache user)"
+echo " chmod -R 777 $1/cache $1/meta (highly discouraged but useful to test when everything fails. It shouldn't be used in production sites)"
 echo
 echo "Please give the server write permissions. Otherwise, LODSPeaKr will not work."
 echo
diff --git a/utils/install b/utils/install
index 5d22ffa5..48986405 100644
--- a/utils/install
+++ b/utils/install
@@ -18,9 +18,9 @@ fi
 if [ ! -e "$home" ]; then
    $GIT clone $lodspeakr_repository
    cd $home
-   ./install.sh
+   ./install.sh $lodspeakr_dir
    cd ..
-   echo "RewriteRule ^(.+)$ $lodspeakr_dir/index.php?q=$1 [L]" >> .htaccess
+   echo "RewriteRule ^(.+)\$ $lodspeakr_dir/index.php?q=\$1 [L]" >> .htaccess
 else
    echo "There is already an existing directory called '$home'. Installation cancelled. Remove it first and try again."
 fi
-- 
GitLab