Shlex behavior is fucked up.

This commit is contained in:
Alexandre Aubin 2019-01-29 00:34:46 +01:00
parent fcb9c17edc
commit 2e976bcdf3

View file

@ -260,6 +260,7 @@ def check_manifest(path):
for service in manifest["services"]: for service in manifest["services"]:
if service not in services: if service not in services:
# FIXME : wtf is it supposed to mean ...
print_warning("[YEP-2.1] " + service + " service may not exist") print_warning("[YEP-2.1] " + service + " service may not exist")
if "install" in manifest["arguments"]: if "install" in manifest["arguments"]:
@ -309,9 +310,9 @@ def check_set_usage(script):
present = False present = False
if script["name"] in ["backup", "remove"]: if script["name"] in ["backup", "remove"]:
present = "ynh_abort_if_errors" in script["raw"] or "set -eu" in script["raw"] present = "ynh_abort_if_errors" in script["shlex"] or "set -eu" in script["raw"]
else: else:
present = "ynh_abort_if_errors" in script["raw"] present = "ynh_abort_if_errors" in script["shlex"]
if script["name"] == "remove": if script["name"] == "remove":
# Remove script shouldn't use set -eu or ynh_abort_if_errors # Remove script shouldn't use set -eu or ynh_abort_if_errors
@ -423,7 +424,9 @@ def main():
print_header(script["name"].upper() + " SCRIPT") print_header(script["name"].upper() + " SCRIPT")
script["raw"] = read_file_raw(script["path"]) script["raw"] = read_file_raw(script["path"])
script["shlex"] = read_file_shlex(script["path"]) # We transform the shlex thing into a list because the original
# object has completely fucked-up behaviors :|.
script["shlex"] = [ l for l in read_file_shlex(script["path"]) ]
check_verifications_done_before_modifying_system(script) check_verifications_done_before_modifying_system(script)
check_set_usage(script) check_set_usage(script)