Accepting request 646693 from system:install:head

- Use only the basename of the keytable
- Use a multi-line compatible sed expression for replacement

OBS-URL: https://build.opensuse.org/request/show/646693
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/live-langset-data?expand=0&rev=10

langset.sh

@@ -35,14 +35,17 @@ fi
 # Read all values of the langset data files
 . "$file"
 
+# Chop the extension off
+KEYTABLE="${KEYTABLE%%.map*}"
+
 # Apply all options
 [ -n "$RC_LC_MESSAGES" ] || RC_LC_MESSAGES=$RC_LANG
 [ -z "$RC_LANG" ] || localectl set-locale LANG=$RC_LANG LC_MESSAGES=$RC_LC_MESSAGES
 
 # set_vconsole_option KEY value
 set_vconsole_option() {
-	# "t;q1" means that this sed command exits with 1 if no substitution was done
-	sed -i"" -E "s/^$1=.+\$/$1=$2/g;t;q1" /etc/vconsole.conf && return
+	# This sed command exits with 1 if no substitution was done
+	sed -i"" -E "/^$1=.*\$/,\${s//$1=$2/;b};\$q1" /etc/vconsole.conf && return
 	echo "$1=$2" >> /etc/vconsole.conf
 }
 

live-langset-data.changes

@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Nov  6 15:23:41 UTC 2018 - Fabian Vogt <fvogt@suse.com>
+
+- Use only the basename of the keytable
+- Use a multi-line compatible sed expression for replacement
+
 -------------------------------------------------------------------
 Wed Oct 31 09:19:22 UTC 2018 - Fabian Vogt <fvogt@suse.com>