s4
diff s4-funcs.sh @ 797:56adb6e5ee68
Add world-links to Grps entry of topmenu
author | HIROSE Yuuji <yuuji@gentei.org> |
---|---|
date | Sun, 14 Jun 2020 11:15:45 +0900 |
parents | 8646ec4bd6fc |
children | 91016ff5edb3 |
line diff
1.1 --- a/s4-funcs.sh Sun Jun 14 10:14:12 2020 +0900 1.2 +++ b/s4-funcs.sh Sun Jun 14 11:15:45 2020 +0900 1.3 @@ -99,9 +99,9 @@ 1.4 if [ -n "$S4WORLDLIST" ]; then 1.5 . ./s4-world.sh 2>> tmp/debug.out 1.6 # Variables set in s4-world.sh 1.7 - # $S4WORLDS, $S4WROLDNAME 1.8 + # $S4WORLDS, $S4WROLDNAME, $S4WORLDGRPS 1.9 # Files created in s4-world.sh 1.10 - # $worldlistfile, $worldoptionfile, $worldnamefile 1.11 + # $worldlistfile, $worldoptionfile, $worldnamefile, $worldgrpfile 1.12 err S4WORLDS set to $S4WORLDS ----- 1.13 fi 1.14 1.15 @@ -461,7 +461,9 @@ 1.16 _m4() { 1.17 #S4NAME=f,f,f 1.18 m4 ${S4NAME:+"-D_S4NAME_=${S4NAME}"} ${S4CSS:+-D_S4CSS_="$S4CSS"} \ 1.19 + ${S4WORLD:+-D_S4WORLD_="$S4WORLD"} \ 1.20 ${S4WORLDNAME:+-D_S4WORLDNAME_="$S4WORLDNAME"} \ 1.21 + ${S4WORLDGRPS:+-D_S4WORLDGRPS_="$S4WORLDGRPS"} \ 1.22 ${S4WORLDS:+-D_S4WORLDS_="$S4WORLDS"} "$@" 1.23 } 1.24 ismember() {