From 674f251cea698afcb4c96758a22c2a44debfe61b Mon Sep 17 00:00:00 2001 From: "Nicola Spanti (RyDroid)" Date: Sun, 8 Oct 2017 02:49:50 +0200 Subject: [PATCH] Very minor changes --- manifest.json | 4 ++-- scripts/install | 15 +++++++++------ 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/manifest.json b/manifest.json index 8d558a7..8d9d98a 100644 --- a/manifest.json +++ b/manifest.json @@ -40,8 +40,8 @@ "en": "Choose a path for Roundcube", "fr": "Choisissez un chemin pour Roundcube" }, - "example": "/webmail", - "default": "/webmail" + "example": "/roundcube", + "default": "/roundcube" }, { "name": "with_carddav", diff --git a/scripts/install b/scripts/install index 04b23be..9ed5599 100644 --- a/scripts/install +++ b/scripts/install @@ -58,10 +58,13 @@ ynh_app_setting_set $app with_enigma $with_enigma #================================================= # jessie-backports is needed for php-net-ldap3 -grep -q -R 'jessie-backports' /etc/apt/sources.list{,.d} || { - echo "deb http://httpredir.debian.org/debian jessie-backports main" \ - | tee -a /etc/apt/sources.list.d/backports.list >/dev/null -} +if test -f /etc/apt/sources.list -o -d /etc/apt/sources.list.d +then + grep -q -R 'jessie-backports' /etc/apt/sources.list{,.d} || { + echo "deb http://httpredir.debian.org/debian jessie-backports main" \ + | tee -a /etc/apt/sources.list.d/backports.list >/dev/null + } +fi ynh_install_app_dependencies "$pkg_dependencies" @@ -77,7 +80,7 @@ ynh_mysql_setup_db $db_name $db_name # DOWNLOAD, CHECK AND UNPACK SOURCE #================================================= -ynh_app_setting_set $app final_path $final_path +ynh_app_setting_set "$app" final_path $final_path # Download, check integrity, uncompress and patch the source from app.src ynh_setup_source "$final_path" @@ -165,7 +168,7 @@ fi sed -i "s#^\s*// installed plugins#&\n ${installed_plugins}#" \ "${final_path}/config/config.inc.php" -# Update javascript dependencies +# Update JavaScript dependencies (cd "${final_path}" /usr/bin/php -q ./bin/install-jsdeps.sh)