From c24cdae83049e22ad35a3908a7d48c7fdc6dad7d Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sat, 27 Aug 2016 21:23:24 +0200 Subject: [PATCH] pretty-hostname: don't cancel script whey trying to remove nonexistent pretty_hostname --- admin/pretty-hostname/files/pretty-hostname | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/admin/pretty-hostname/files/pretty-hostname b/admin/pretty-hostname/files/pretty-hostname index fb1705e..6d6ef13 100755 --- a/admin/pretty-hostname/files/pretty-hostname +++ b/admin/pretty-hostname/files/pretty-hostname @@ -1,15 +1,13 @@ #!/bin/sh -set -e - case $# in 0) uci -q get 'system.@system[0].pretty_hostname' || uci get 'system.@system[0].hostname' ;; 1) - local pretty_hostname="$1" + pretty_hostname="$1" # Remove invalid characters and leading/trailing spaces - local hostname="$(echo -n "$pretty_hostname" | sed -r -e 's/[^a-zA-Z0-9-]//g' -e 's/-+/-/g' -e 's/^-//')" + hostname="$(echo -n "$pretty_hostname" | sed -r -e 's/[^a-zA-Z0-9-]//g' -e 's/-+/-/g' -e 's/^-//')" hostname="${hostname:0:63}" hostname="$(echo -n "$hostname" | sed -e 's/-$//')"