From 4276aebfa379fcbc8f6fc0bca911aaa1a01742b4 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Sun, 10 Dec 2017 23:38:09 +0100 Subject: [PATCH 1/3] [enh] Default version number for ynh_install_app_dependencies --- data/helpers.d/package | 3 +++ 1 file changed, 3 insertions(+) diff --git a/data/helpers.d/package b/data/helpers.d/package index f28691579..f6c9c07db 100644 --- a/data/helpers.d/package +++ b/data/helpers.d/package @@ -124,6 +124,9 @@ ynh_install_app_dependencies () { manifest_path="../settings/manifest.json" # Into the restore script, the manifest is not at the same place fi version=$(grep '\"version\": ' "$manifest_path" | cut -d '"' -f 4) # Retrieve the version number in the manifest file. + if [ " ${#version}" -eq 0 ]; then + version="1.0" + if dep_app=${app//_/-} # Replace all '_' by '-' cat > /tmp/${dep_app}-ynh-deps.control << EOF # Make a control file for equivs-build From 2685c42ac605b9a79cb389791f415e97b7214ef4 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Mon, 11 Dec 2017 17:23:26 +0100 Subject: [PATCH 2/3] [fix] Only for JimboJoe ;) --- data/helpers.d/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/helpers.d/package b/data/helpers.d/package index f6c9c07db..a337bdd09 100644 --- a/data/helpers.d/package +++ b/data/helpers.d/package @@ -126,7 +126,7 @@ ynh_install_app_dependencies () { version=$(grep '\"version\": ' "$manifest_path" | cut -d '"' -f 4) # Retrieve the version number in the manifest file. if [ " ${#version}" -eq 0 ]; then version="1.0" - if + fi dep_app=${app//_/-} # Replace all '_' by '-' cat > /tmp/${dep_app}-ynh-deps.control << EOF # Make a control file for equivs-build From 42f9c8fc185a04a999360cb0005bf27abba8d851 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Mon, 11 Dec 2017 17:25:28 +0100 Subject: [PATCH 3/3] [fix] Who said I didn't check my code !? --- data/helpers.d/package | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/data/helpers.d/package b/data/helpers.d/package index a337bdd09..2e60d723e 100644 --- a/data/helpers.d/package +++ b/data/helpers.d/package @@ -124,7 +124,7 @@ ynh_install_app_dependencies () { manifest_path="../settings/manifest.json" # Into the restore script, the manifest is not at the same place fi version=$(grep '\"version\": ' "$manifest_path" | cut -d '"' -f 4) # Retrieve the version number in the manifest file. - if [ " ${#version}" -eq 0 ]; then + if [ ${#version} -eq 0 ]; then version="1.0" fi dep_app=${app//_/-} # Replace all '_' by '-'