From 952b85f3ecbe67bdaa079e5a57f3f6f8fc903ae1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A9veloppeur=20=C3=A9gar=C3=A9?= Date: Mon, 9 Mar 2015 16:37:10 +0100 Subject: [PATCH] update for multi instance function --- scripts/install | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/install b/scripts/install index 0f92f6d..d1aad4e 100644 --- a/scripts/install +++ b/scripts/install @@ -27,8 +27,10 @@ admin_mail=$(sudo yunohost user info $user | grep "mail:" | cut -d' ' -f2) # Get code version=$(cat upstream_version) -git clone -b "${version}" 'https://github.com/friendica/friendica.git' -git clone -b "master" 'https://github.com/friendica/friendica-addons.git' +repo_url=$(cat ../conf/repo_url) +repo_url_addons=$(cat ../conf/repo_url_addons) +git clone -b "${version}" $repo_url friendica +git clone -b "master" $repo_url_addons friendica-addons sudo mv friendica-addons friendica/addon sudo cp -ar friendica $final_path @@ -65,12 +67,6 @@ sudo sed -i "s/\['admin_email'\] = '';/\['admin_email'\] = '$admin_mail';/g" $fi mysql -u $db_user -p$db_pwd $db_user < $final_path/database.sql -# Ldap auth -#wget -O ldapauth.php https://raw.githubusercontent.com/friendica/friendica-addons/master/ldapauth/ldapauth.php > /dev/null 2>&1 -#echo "Copy ldapauth.php to $final_path/addon/ldapauth..." -#mkdir -p $final_path/addon/ldapauth -#sudo cp ldapauth.php $final_path/addon/ldapauth - # addon config sudo su -c "cat ../conf/conf.php >> $final_path/.htconfig.php"