From f87ed8adfff3e8bffa862a4e377bcc81ce12b3f9 Mon Sep 17 00:00:00 2001
From: ericgaspar <junk.eg@free.fr>
Date: Wed, 7 Jul 2021 09:22:45 +0200
Subject: [PATCH] Fix

---
 .DS_Store                      | Bin 0 -> 6148 bytes
 {scripts => conf}/password.php |   0
 scripts/.DS_Store              | Bin 0 -> 6148 bytes
 scripts/install                |  22 +++++++---------------
 4 files changed, 7 insertions(+), 15 deletions(-)
 create mode 100644 .DS_Store
 rename {scripts => conf}/password.php (100%)
 create mode 100644 scripts/.DS_Store

diff --git a/.DS_Store b/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..24cab563f248ac357eeb17af858dc972ec466670
GIT binary patch
literal 6148
zcmeHK!A`<J5ZwjT5@YPaM2>s$#sQ*2IG8ku2X7`ddQbzcpfssn0!5;=roW+o<QMom
z&g?Ekf+n7fk(p-p&Cbs3W?q}!E@O;0$K5JpHe<{JMa&hU`9g3UbwP5*gUE3Xe=-{Q
zq4c5uwh&E@zsLZ-y8^prl11$1^ZWA$VK9m-m3N-Y7gko+tRg%c)|K0r6F2ta@u=wy
zFR*vw#eLt{r&5M9+w;$Y-lT1B9m**7f~YrC$w9XVA(!Vt)RmK_97o-en#a`xxK6Qc
zmy)E>sFg)^zmb+jQm<FaVsE#WrbTOer+RSQxqEm_p3>(R%_@fvP|2pjDZGL)EAZYO
zMxl&u!8eVc#t{+&!~ij{L=2cM&{|)jnyFM`fEf501Gqm3P(;UIrcrGj(BSVQju#M7
zz{a}-qA=(f%rwFX2-m5AI+dF%2G{A}7beazm}%7MjH{Jl9<wqxHx#Z`2ft9^j5`{s
zB?gFrc?R;jYvcKU^!@#RK8bq705R~d7~qAL+iF5d=4@Rk4$oQv+5ttuxJ=_L1q^i*
gLo6P}B~T^c7ia)F1~ZM|0ihoOMFTa&z^^j!0o^4~uK)l5

literal 0
HcmV?d00001

diff --git a/scripts/password.php b/conf/password.php
similarity index 100%
rename from scripts/password.php
rename to conf/password.php
diff --git a/scripts/.DS_Store b/scripts/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..5008ddfcf53c02e82d7eee2e57c38e5672ef89f6
GIT binary patch
literal 6148
zcmeH~Jr2S!425mzP>H1@V-^m;4Wg<&0T*E43hX&L&p$$qDprKhvt+--jT7}7np#A3
zem<@ulZcFPQ@L2!n>{z**<q8>++&mCkOWA81W14cNZ<zv;LbK1Poaz?KmsK2CSc!(
z0ynLxE!0092;Krf2c+FF_Fe*7ECH>lEfg7;MkzE(HCqgga^y>{tEnwC%0;vJ&^%eQ
zLs35+`xjp>T0<F0fCPF1$Cyrb|F7^5{eNG?83~ZUUlGt@xh*qZDeu<Z%US-OSsOPv
j)R!Z4KLME7ReXlK;d!wEw5GODWMKRea10D2@KpjYNUI8I

literal 0
HcmV?d00001

diff --git a/scripts/install b/scripts/install
index 82c1f0b..86f89f8 100644
--- a/scripts/install
+++ b/scripts/install
@@ -88,25 +88,11 @@ ynh_script_progression --message="Configuring PHP-FPM..." --weight=2
 ynh_add_fpm_config --package="$extra_php_dependencies"
 phpversion=$(ynh_app_setting_get --app=$app --key=phpversion)
 
-#=================================================
-# SPECIFIC SETUP
-#=================================================
-# CONFIGURE BICBUCSTRIIM
-#=================================================
-
-books_path=/home/$admin/calibre_library
-cp -r ../empty_library $books_path
-
-# Disable BicBucStriim login if checked
-if [[ $login -eq 1 ]]; then
-  sed -i -- 's/\[LOGIN_REQUIRED\] = 1/\[LOGIN_REQUIRED\] = 0/g' "$final_path"/index.php
-fi
-
 #=================================================
 # SECURE FILES AND DIRECTORIES
 #=================================================
 
-cp password.php $final_path/ynh_password.php
+cp ../conf/password.php $final_path/ynh_password.php
 cd $final_path
 hash=$(php ynh_password.php $admin_pwd)
 rm ynh_password.php
@@ -131,12 +117,18 @@ datadir=/home/yunohost.app/$app
 ynh_app_setting_set --app=$app --key=datadir --value=$datadir
 
 mkdir -p $datadir
+cp -r ../empty_library $baradir
 
 chmod 750 "$datadir"
 #chmod -R o-rwx "$datadir"
 chown -R $app:www-data "$datadir"
 chmod -R ga+w "$datadir"
 
+# Disable BicBucStriim login if checked
+if [[ $login -eq 1 ]]; then
+  sed -i -- 's/\[LOGIN_REQUIRED\] = 1/\[LOGIN_REQUIRED\] = 0/g' $final_path/index.php
+fi
+
 #=================================================
 # SETUP SSOWAT
 #=================================================