diff --git a/README.md b/README.md index f2962ec..114d1ce 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in Extendable continuous integration server -**Shipped version:** 2.401.2~ynh1 +**Shipped version:** 2.401.2~ynh2 ## Screenshots diff --git a/README_fr.md b/README_fr.md index f3e2856..94efd72 100644 --- a/README_fr.md +++ b/README_fr.md @@ -18,7 +18,7 @@ Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) po Serveur d'intégration continue extensible -**Version incluse :** 2.401.2~ynh1 +**Version incluse :** 2.401.2~ynh2 ## Captures d’écran diff --git a/manifest.json b/manifest.json index 74b2ea7..1b7537b 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Extendable continuous integration server", "fr": "Serveur d'intégration continue extensible" }, - "version": "2.401.2~ynh1", + "version": "2.401.2~ynh2", "url": "https://jenkins.io/index.html", "upstream": { "license": "MIT", diff --git a/scripts/install b/scripts/install index cf2861e..36d336b 100644 --- a/scripts/install +++ b/scripts/install @@ -115,12 +115,17 @@ ynh_add_nginx_config ynh_script_progression --message="Installing Jenkins..." # Download jenkins deb file and install it. -dpkg --install --force-confnew ../conf/jenkins.deb +dpkg --install --force-confnew ../conf/jenkins.deb || true +dpkg_install_failed=$(dpkg-query -f '${status} ${package}\n' -W | awk '$4 ~ /^jenkins.*/ && $3 != "installed" {print $4}' | wc -l) + +if [[ $dpkg_install_failed -ge 1 ]]; then + ynh_print_warn --message="The service jenkins cannot be started for now." +fi #================================================= # SETUP APPLICATION #================================================= -ynh_script_progression --message="Setuping application..." +ynh_script_progression --message="Setuping application on port $port..." cat >> "$final_path/jenkins.install.InstallUtil.lastExecVersion" <