diff --git a/check_process b/check_process index ffc8451..c7e7a34 100644 --- a/check_process +++ b/check_process @@ -1,9 +1,9 @@ ;; Test complet ; Manifest - domain="domain.tld" (DOMAIN) - path="/" (PATH) - is_public=1 (PUBLIC|public=1|private=0) - port="7777" (PORT) + domain="domain.tld" + path="/" + is_public=1 + port="7777" ; Checks pkg_linter=1 setup_sub_dir=0 diff --git a/conf/app.src b/conf/app.src index 0cee885..c6b22d8 100644 --- a/conf/app.src +++ b/conf/app.src @@ -3,4 +3,3 @@ SOURCE_SUM=099bf0cec59614f0f6151f0809c8580b85d5fe701892dda96263b8aee743d5d8 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= diff --git a/manifest.json b/manifest.json index 012d429..6e1eb2a 100644 --- a/manifest.json +++ b/manifest.json @@ -10,7 +10,7 @@ "url": "http://hastebin.com/", "upstream": { "license": "MIT", - "website": "https://example.com", + "website": "http://hastebin.com/", "demo": "http://hastebin.com/", "userdoc": "https://hastebin.com/about.md", "code": "https://github.com/seejohnrun/haste-server" diff --git a/scripts/remove b/scripts/remove index e9b14d8..e567844 100755 --- a/scripts/remove +++ b/scripts/remove @@ -78,6 +78,17 @@ ynh_secure_remove --file="/usr/bin/$app" ynh_secure_remove --file="$data_path" +#================================================= +# REMOVE DATA DIR +#================================================= + +# Remove the data directory if --purge option is used +if [ "${YNH_APP_PURGE:-0}" -eq 1 ] +then + ynh_script_progression --message="Removing app data directory..." --weight=1 + ynh_secure_remove --file="$data_path" +fi + #================================================= # REMOVE NODEJS #================================================= diff --git a/scripts/restore b/scripts/restore index 0cb0ac8..234e2c8 100755 --- a/scripts/restore +++ b/scripts/restore @@ -33,8 +33,7 @@ data_path=$(ynh_app_setting_get --app=$app --key=data_path) #================================================= ynh_script_progression --message="Validating restoration parameters..." --weight=2 -test ! -d $final_path \ - || ynh_die "There is already a directory: $final_path " +test ! -d $final_path || ynh_die "There is already a directory: $final_path " #================================================= # STANDARD RESTORATION STEPS