Commit 19fb48e

author

egberts

committed

Polish the example code

1 parent 474d6ac commit 19fb48eCopy full SHA for 19fb48e

File tree

+47

-10

lines changed

+47

-10

lines changed

Lines changed: 27 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,12 +29,37 @@ Features:`
`29`	`29`
`30`	`30`	`Demo`
`31`	`31`	`====`
`32`		`-A nice bash script can be:`
	`32`	+A nice bash script can be either my `example-usage.sh` script or below:
`33`	`33`
`34`	`34`	```bash
`35`	`35`	`source bash-ini-parser.sh`
`36`		`-my_ini="$(cat "/etc/systemd/systemd.conf" \| ini_file_read`
	`36`	`+raw_data="$(cat "/etc/systemd/systemd.conf" \| ini_file_read`
`37`	`37`	`ini_kv_get "Default" "DNS"`
	`38`	`+# outputs the keyvalue`
	`39`	+```
	`40`	`+`
	`41`	+Or with `example-usage.sh`, this script will try to read systemd config file and determine which Display Manager that you are using:
	`42`	`+`
	`43`	+```console
	`44`	`+$ bash example-usage.sh`
	`45`	`+File : /etc/systemd/system/display-manager.service`
	`46`	`+Keyword : ExecStart`
	`47`	`+Keyvalue: /usr/bin/sddm # <--- your section/keyword/keyvalue answer`
	`48`	`+`
	`49`	`+Came from all that below:`
	`50`	`+"[Unit]Description=Simple Desktop Display Manager`
	`51`	`+[Unit]Documentation=man:sddm(1) man:sddm.conf(5)`
	`52`	`+[Unit]Conflicts=getty@tty1.service getty@tty7.service`
	`53`	`+[Unit]After=getty@tty1.service getty@tty7.service`
	`54`	`+[Unit]After=systemd-user-sessions.service systemd-logind.service`
	`55`	`+[Unit]After=haveged.service`
	`56`	`+[Service]ExecStart=/usr/bin/sddm`
	`57`	`+[Service]Restart=always`
	`58`	`+[Service]RestartSec=1s`
	`59`	`+[Service]EnvironmentFile=-/etc/default/locale`
	`60`	`+[Install]Alias=display-manager.service"`
	`61`	`+`
	`62`	`+Done.`
`38`	`63`	```
`39`	`64`
`40`	`65`	`Unit Test`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -202,11 +202,11 @@ ini_kw_get()`
`202`	`202`	`#`
`203`	`203`	`#`
`204`	`204`	`# into BASH, for now, do simple removal of inline comment`
`205`		`- kv="$(echo "$kv" \| sed "/^\s;/d;s/\s;[^\"']*$//")"`
`206`		`- # echo "kv2: $kv"`
`207`		`- kv="$(echo "$kv" \| sed "/^\s#/d;s/\s#[^\"']*$//")"`
`208`		`- # echo "kv4: $kv"`
`209`		`- kv="$(echo "$kv" \| sed "/^\s\/\//d;s/\s\/\/[^\"']*$//")"`
	`205`	`+# kv="$(echo "$kv" \| sed "/^\s;/d;s/\s;[^\"']*$//")"`
	`206`	`+# # echo "kv2: $kv"`
	`207`	`+# kv="$(echo "$kv" \| sed "/^\s#/d;s/\s#[^\"']*$//")"`
	`208`	`+# # echo "kv4: $kv"`
	`209`	`+# kv="$(echo "$kv" \| sed "/^\s\/\//d;s/\s\/\/[^\"']*$//")"`
`210`	`210`	`# echo "kv5: $kv"`
`211`	`211`
`212`	`212`	`# remove surrounding whitespaces`

Lines changed: 15 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -3,11 +3,23 @@`
`3`	`3`	`# Title: Demo of bash-ini-parser.sh`
`4`	`4`	`#`
`5`	`5`
	`6`	`+ini_filespec="/etc/systemd/system/display-manager.service"`
	`7`	`+section="Service"`
	`8`	`+keyword="ExecStart"`
	`9`	`+`
`6`	`10`	`source bash-ini-parser.sh`
`7`	`11`
`8`		`-my_raw="$(cat /etc/systemd/system/display-manager.service)"`
	`12`	`+raw_data="$(cat $ini_filespec)"`
`9`	`13`
`10`		`-my_ini="$(ini_file_read "$my_ini")"`
	`14`	`+ini_settings="$(ini_file_read "$raw_data")"`
`11`	`15`
`12`		`-ini_kw_get "$my_ini" "Service" "ExecStart"`
	`16`	`+keyvalue="$(ini_kw_get "$ini_settings" "$section" "$keyword")"`
`13`	`17`
	`18`	`+echo "File : $ini_filespec"`
	`19`	`+echo "Keyword : $keyword"`
	`20`	`+echo "Keyvalue: $keyvalue # <--- your section/keyword/keyvalue answer"`
	`21`	`+echo`
	`22`	`+echo "Came from all that below:"`
	`23`	`+echo "\"$ini_settings\""`
	`24`	`+echo`
	`25`	`+echo "Done."`

Comments

(0)