diff --git a/install.sh b/install.sh index 7426c09651e43a0ebacd066f69fe4b3b6c27eb8f..08bdc17ee02e5ec432282b953edef50d3b35c918 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 48986405d658cafdcc69d54a29b41cdf9527d865..d07f57dec20fefc0e85b3017d1b38ab462d58024 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