فهرست منبع

linting fixes

sparklyballs 7 سال پیش
والد
کامیت
7bfe78e53e
1فایلهای تغییر یافته به همراه5 افزوده شده و 11 حذف شده
  1. 5 11
      root/etc/cont-init.d/40-install

+ 5 - 11
root/etc/cont-init.d/40-install

@@ -7,22 +7,16 @@ declare config
 echo "fetching photoshow files from github"
 git clone https://github.com/thibaud-rohmer/PhotoShow.git /config/www/PhotoShow
 
-# set config
-THUMBS="/Thumbs"
-PICTURES="/Pictures"
-
-if [ ! -f "/config/www/PhotoShow/config.php" ]; then
-sed -i -e "s#$config->photos_dir.\+#$config->photos_dir = \"${PICTURES}\";#" /config/www/PhotoShow/config.php
-sed -i -e "s#$config->ps_generated.\+#$config->ps_generated = \"${THUMBS}\";#" /config/www/PhotoShow/config.php
-fi
+sed -i \
+	-e "s#$config->photos_dir.*#$config->photos_dir = \"/Pictures\";#g" \
+	-e "s#$config->ps_generated.*#$config->ps_generated  = \"/Thumbs\";#g" \
+	-e "s@\$config->timezone.*@\$config->timezone = \"${TZ}\"@g" \
+/config/www/PhotoShow/config.php
 
 # patch in fixed keyboard.js file
 cp /defaults/keyboard.js /config/www/PhotoShow/src/js/keyboard.js
-sed -i -e "s@\$config->timezone.*@\$config->timezone = \"${TZ}\"@g" /config/www/PhotoShow/config.php
 
 # permissions
 chown -R abc:abc \
 	/config/www/PhotoShow \
 	/Thumbs
-
-