linux-qubasis
linux oasis port as a qubes template
git clone https://9o.is/git/linux-qubasis.git
commit 277a0bf8368b484e4dddd9aea8cb5280993992cc parent 0dc90eea9b742ff58efa6d0a8b403161fe5256e7 Author: Jul <jul@9o.is> Date: Mon, 25 Aug 2025 11:51:59 +0800 reduce quoting in gen.sh files Diffstat:
| M | gen.sh | | | 14 | +++++++------- |
| M | ninja/functions.sh | | | 34 | +++++++++++++++++++--------------- |
| M | pkg/abduco/gen.sh | | | 2 | +- |
| M | pkg/mandoc/gen.sh | | | 12 | ++++++------ |
| M | pkg/netbsd-curses/gen.sh | | | 62 | +++++++++++++++++++++++++++++++------------------------------- |
| M | pkg/oksh/gen.sh | | | 2 | +- |
| M | pkg/sbase/gen.sh | | | 10 | +++++----- |
7 files changed, 70 insertions(+), 66 deletions(-)
diff --git a/gen.sh b/gen.sh @@ -1,9 +1,9 @@ -setv 'ninja_required_version' '1.8' -setv 'basedir' '.' -setv 'builddir' "$BUILDDIR" -setv 'outdir' '$builddir' -setv 'ninjadir' '$builddir/ninja' -setv 'dir' '$basedir' +setv ninja_required_version 1.8 +setv basedir . +setv builddir $BUILDDIR +setv outdir $builddir +setv ninjadir $builddir/ninja +setv dir $basedir setv ar $TARGET_PLATFORM-ar setv as $TARGET_PLATFORM-as @@ -13,7 +13,7 @@ setv objcopy $TARGET_PLATFORM-objcopy setv cflags $TARGET_CFLAGS setv ldflags $TARGET_LDFLAGS -include '$basedir/ninja/rules.ninja' +include $basedir/ninja/rules.ninja subgen pkg/abduco subgen pkg/mandoc diff --git a/ninja/functions.sh b/ninja/functions.sh @@ -200,7 +200,7 @@ _ninja_complete() { local gen_files='$basedir/config.sh $basedir/ninja/functions.sh $dir/gen.sh' _ninja_flush - build gen "\$ninjadir/$_ninja_file" "| $gen_files" + build gen $ninjadir/$_ninja_file '|' $gen_files mv $_ninja_writepath ${_ninja_writepath%.*} if [ ! "$_ninja_gendir" ]; then @@ -240,19 +240,21 @@ _ninja_initglobals() { } _ninja_setv_init() { - setv 'gendir' "$1" + setv gendir "$1" if [ "$1" != '.' ]; then - setv 'dir' '$basedir/$gendir' - setv 'outdir' '$builddir/$gendir' - setv 'srcdir' '$dir/repo' + setv dir '$basedir/$gendir' + setv outdir '$builddir/$gendir' + setv srcdir '$dir/repo' fi if [ ! "${1#tpl/}" = "$1" ]; then - setv 'rootdir' '$outdir/root' + setv rootdir '$outdir/root' fi basedir='$basedir' + builddir='$builddir' + ninjadir='$ninjadir' gendir='$gendir' dir='$dir' outdir='$outdir' @@ -312,13 +314,13 @@ _ninja_compile() { for src in $srcs; do case $src in *.c) - obj="\$outdir/o/${src#\$srcdir/}.o" + obj=$objdir/${src#\$srcdir/}.o if [ "$_ninja_buffer_deps" ]; then src="$src || \$gendir/deps$_ninja_sub" fi - build cc "$obj" "$src" + build cc $obj $src objs="$objs $obj" ;; *.[ao]) @@ -380,8 +382,8 @@ _ninja_flush_builds() { printf 'subninja $ninjadir/%s.ninja\n' "$pkg" >> "$_ninja_writepath" done - build phony "\$gendir/configure$_ninja_sub" "\$ninjadir/$_ninja_file" - build phony "\$gendir/build$_ninja_sub" "$_ninja_buffer_builds" "$subbuilds" + build phony $gendir/configure$_ninja_sub $ninjadir/$_ninja_file + build phony $gendir/build$_ninja_sub "$_ninja_buffer_builds" "$subbuilds" _ninja_buffer_subgen= _ninja_buffer_builds= @@ -395,24 +397,26 @@ _ninja_flush_sync() { subsyncs="$subsyncs \$gendir/$pkg/sync" done - build phony "\$gendir/sync$_ninja_sub" "$subsyncs" + build phony $gendir/sync$_ninja_sub "$subsyncs" if [ ! -f "$verfile" ]; then - build touch '$outdir/meta/version' + build touch $outdir/meta/version return fi - build sync '$outdir/meta/version' '$gendir/version | $basedir/ninja/sync.sh' + build sync $outdir/meta/version $gendir/version '|' $basedir/ninja/sync.sh if [ "$_ninja_buffer_sync" ]; then - build phony "$_ninja_buffer_sync" '$outdir/meta/version' + build phony "$_ninja_buffer_sync" $outdir/meta/version fi _ninja_buffer_sync= } _ninja_flush_deps() { - build phony "\$gendir/deps$_ninja_sub" "$_ninja_buffer_deps" + if [ "$_ninja_buffer_deps" ]; then + build phony $gendir/deps$_ninja_sub "$_ninja_buffer_deps" + fi _ninja_buffer_deps= } diff --git a/pkg/abduco/gen.sh b/pkg/abduco/gen.sh @@ -2,7 +2,7 @@ cflags -std=c99 \ -D _POSIX_C_SOURCE=200809L \ -D _XOPEN_SOURCE=700 \ -D VERSION='\"0.6\"' \ - -I '$dir/include' \ + -I $dir/include \ -Wno-sign-compare \ -Wno-unused-parameter diff --git a/pkg/mandoc/gen.sh b/pkg/mandoc/gen.sh @@ -1,5 +1,5 @@ -cflags -I '$dir/include' \ - -I '$builddir/pkg/zlib/include' \ +cflags -I $dir/include \ + -I $builddir/pkg/zlib/include \ -D MANPATH_BASE='"\"'/$MANDIR'\""' \ -D MANPATH_DEFAULT='"\"'/$MANDIR'\""' \ -Wno-implicit-function-declaration \ @@ -74,12 +74,12 @@ exe mandoc dba.c \ term_tab.c \ term_tag.c \ tree.c \ - '$outdir/libmandoc.a' \ - '$builddir/pkg/zlib/libz.a' + $outdir/libmandoc.a \ + $builddir/pkg/zlib/libz.a exe demandoc demandoc.c \ - '$outdir/libmandoc.a' \ - '$builddir/pkg/zlib/libz.a' + $outdir/libmandoc.a \ + $builddir/pkg/zlib/libz.a sym apropos mandoc sym man mandoc diff --git a/pkg/netbsd-curses/gen.sh b/pkg/netbsd-curses/gen.sh @@ -1,13 +1,13 @@ cflags -D _XOPEN_SOURCE=700 \ -D TERMINFO_DB \ -D _PATH_TERMINFO='"\"'$PREFIX/share/misc/terminfo'"\"' \ - -I '$srcdir/compat' \ - -I '$srcdir/lib/libcurses' \ - -I '$srcdir/lib/libterminfo' \ - -I '$srcdir/lib/libform' \ - -I '$srcdir/lib/libmenu' \ - -I '$srcdir/lib/libpanel' \ - -I '$outdir/include' \ + -I $srcdir/compat \ + -I $srcdir/lib/libcurses \ + -I $srcdir/lib/libterminfo \ + -I $srcdir/lib/libform \ + -I $srcdir/lib/libmenu \ + -I $srcdir/lib/libpanel \ + -I $outdir/include \ -Wno-implicit-function-declaration \ -Wno-unused-parameter \ -Wno-sign-compare \ @@ -16,20 +16,20 @@ cflags -D _XOPEN_SOURCE=700 \ -Wno-type-limits tic() { - build tic "\$outdir/$1" '$srcdir/share/terminfo/terminfo' '| $outdir/tools/tic' - bind ticflags "$2" + build tic $outdir/$1 $srcdir/share/terminfo/terminfo '|' $outdir/tools/tic + bind ticflags $2 if [ "${3-}" ]; then - bind term "$3" + bind term $3 fi } nbperf() { - local script="\$srcdir/lib/libterminfo/$1" - local out="\$outdir/$2" - local src="\$srcdir/$3" + local script=$srcdir/lib/libterminfo/$1 + local out=$outdir/$2 + local src=$srcdir/$3 - build nbperf "$out" "$script" "$src" '|' "$script" '$outdir/tools/nbperf' - sync "$src" + build nbperf $out $script $src '|' $script $outdir/tools/nbperf + sync $src } tools() { @@ -37,20 +37,20 @@ tools() { setv ld ld setv ldflags $HOST_LDFLAGS setv cflags $HOST_CFLAGS \ - -I '$srcdir/compat' \ - -I '$srcdir/lib/libterminfo' - setv outdir '$outdir/tools' + -I $srcdir/compat \ + -I $srcdir/lib/libterminfo + setv outdir $outdir/tools compile compat/cdbw.c compile compat/mi_vector_hash.c compile usr.bin/tic/tic.c compile lib/libterminfo/compile.c - exe tic '$outdir/o/lib/libterminfo/compile.c.o' \ - '$outdir/o/compat/cdbw.c.o' \ - '$outdir/o/compat/mi_vector_hash.c.o' \ - '$outdir/o/usr.bin/tic/tic.c.o' \ - '$outdir/../deps/hash.c' + exe tic $objdir/lib/libterminfo/compile.c.o \ + $objdir/compat/cdbw.c.o \ + $objdir/compat/mi_vector_hash.c.o \ + $objdir/usr.bin/tic/tic.c.o \ + $outdir/../deps/hash.c exe nbperf usr.bin/nbperf/nbperf.c \ usr.bin/nbperf/nbperf-bdz.c \ @@ -58,7 +58,7 @@ tools() { usr.bin/nbperf/nbperf-chm3.c \ usr.bin/nbperf/graph2.c \ usr.bin/nbperf/graph3.c \ - '$outdir/o/compat/mi_vector_hash.c.o' + $objdir/compat/mi_vector_hash.c.o } subninja tools @@ -84,7 +84,7 @@ lib libterminfo.a compat/cdbr.c \ lib/libterminfo/tparm.c \ lib/libterminfo/tputs.c \ lib/libterminfo/termcap.c \ - '$outdir/deps/hash.c' + $outdir/deps/hash.c lib libcurses.a lib/libcurses/acs.c \ lib/libcurses/add_wch.c \ @@ -177,28 +177,28 @@ lib libcurses.a lib/libcurses/acs.c \ lib/libcurses/unctrl.c \ lib/libcurses/underscore.c \ lib/libcurses/version.c \ - '$outdir/libterminfo.a' + $outdir/libterminfo.a exe infocmp usr.bin/infocmp/infocmp.c \ - '$outdir/libterminfo.a' + $outdir/libterminfo.a exe tabs usr.bin/tabs/tabs.c \ - '$outdir/libterminfo.a' + $outdir/libterminfo.a exe tic compat/cdbw.c \ lib/libterminfo/compile.c \ usr.bin/tic/tic.c \ - '$outdir/libterminfo.a' + $outdir/libterminfo.a exe tput usr.bin/tput/tput.c \ - '$outdir/libterminfo.a' + $outdir/libterminfo.a exe tset usr.bin/tset/map.c \ usr.bin/tset/misc.c \ usr.bin/tset/set.c \ usr.bin/tset/term.c \ usr.bin/tset/tset.c \ - '$outdir/libterminfo.a' + $outdir/libterminfo.a sym reset tset man usr.bin/infocmp/infocmp.1 infocmp.1 diff --git a/pkg/oksh/gen.sh b/pkg/oksh/gen.sh @@ -2,7 +2,7 @@ cflags -D SMALL \ -D EMACS \ -D VI \ -D _GNU_SOURCE \ - -I '$dir/include' \ + -I $dir/include \ -Wno-pedantic \ -Wno-unused-but-set-variable \ -Wno-sign-compare \ diff --git a/pkg/sbase/gen.sh b/pkg/sbase/gen.sh @@ -3,7 +3,7 @@ cflags -std=c99 \ -D _BSD_SOURCE \ -D _NETBSD_SOURCE \ -D _XOPEN_SOURCE=700 \ - -I '$outdir/include' \ + -I $outdir/include \ -Wno-maybe-uninitialized \ -Wno-parentheses \ -Wno-misleading-indentation \ @@ -75,14 +75,14 @@ lib libutf.a libutf/fgetrune.c \ libutf/utftorunestr.c rule getconf '$srcdir/scripts/getconf.sh >$out' -build getconf '$outdir/include/getconf.h' '| $srcdir/scripts/getconf.sh' +build getconf $outdir/include/getconf.h '|' $srcdir/scripts/getconf.sh -deps '$outdir/include/getconf.h' +deps $outdir/include/getconf.h exes() { for src in "$@"; do - exe "$src" "$src.c" '$outdir/libutil.a' '$outdir/libutf.a' - man "$src.1" + exe $src $src.c $outdir/libutil.a $outdir/libutf.a + man $src.1 done }