Re: /etc/rc: remove useless cat

2019-11-10 Thread Antoine Jacoutot 
On Sun, Nov 10, 2019 at 02:51:32PM +0100, Christian Weisgerber wrote:
> Since /etc/rc uses ksh constructs anyway, we should use $( of $(cat file).
> 
> ok?

OK aja

> 
> Index: rc
> ===
> RCS file: /cvs/src/etc/rc,v
> retrieving revision 1.540
> diff -u -p -r1.540 rc
> --- rc6 Nov 2019 16:26:24 -   1.540
> +++ rc10 Nov 2019 13:48:36 -
> @@ -220,7 +220,7 @@ reorder_libs() {
>   $_install /usr/libexec/ld.so /usr/libexec/ld.so.save
>   $_install ld.so.test $_lib_dir/ld.so
>   else
> - cc -shared -o $_lib $(ls *.so | sort -R) $(cat .ldadd)
> + cc -shared -o $_lib $(ls *.so | sort -R) $(<.ldadd)
>   [[ -s $_lib ]] && file $_lib | fgrep -q 'shared object'
>   LD_BIND_NOW=1 LD_LIBRARY_PATH=$_tmpdir awk 'BEGIN {exit 
> 0}'
>   LD_BIND_NOW=1 LD_LIBRARY_PATH=$_tmpdir openssl \
> @@ -389,7 +389,7 @@ ttyflags -a
>  
>  # Set keyboard encoding.
>  if [[ -x /sbin/kbd && -s /etc/kbdtype ]]; then
> - kbd "$(cat /etc/kbdtype)"
> + kbd "$(  fi
>  
>  wsconsctl_conf
> -- 
> Christian "naddy" Weisgerber  na...@mips.inka.de
> 

-- 
Antoine

Re: /etc/rc: remove useless cat

2019-11-10 Thread Theo Buehler 
On Sun, Nov 10, 2019 at 02:51:32PM +0100, Christian Weisgerber wrote:
> Since /etc/rc uses ksh constructs anyway, we should use $( of $(cat file).
> 
> ok?

ok

> 
> Index: rc
> ===
> RCS file: /cvs/src/etc/rc,v
> retrieving revision 1.540
> diff -u -p -r1.540 rc
> --- rc6 Nov 2019 16:26:24 -   1.540
> +++ rc10 Nov 2019 13:48:36 -
> @@ -220,7 +220,7 @@ reorder_libs() {
>   $_install /usr/libexec/ld.so /usr/libexec/ld.so.save
>   $_install ld.so.test $_lib_dir/ld.so
>   else
> - cc -shared -o $_lib $(ls *.so | sort -R) $(cat .ldadd)
> + cc -shared -o $_lib $(ls *.so | sort -R) $(<.ldadd)
>   [[ -s $_lib ]] && file $_lib | fgrep -q 'shared object'
>   LD_BIND_NOW=1 LD_LIBRARY_PATH=$_tmpdir awk 'BEGIN {exit 
> 0}'
>   LD_BIND_NOW=1 LD_LIBRARY_PATH=$_tmpdir openssl \
> @@ -389,7 +389,7 @@ ttyflags -a
>  
>  # Set keyboard encoding.
>  if [[ -x /sbin/kbd && -s /etc/kbdtype ]]; then
> - kbd "$(cat /etc/kbdtype)"
> + kbd "$(  fi
>  
>  wsconsctl_conf
> -- 
> Christian "naddy" Weisgerber  na...@mips.inka.de
>

/etc/rc: remove useless cat

2019-11-10 Thread Christian Weisgerber 
Since /etc/rc uses ksh constructs anyway, we should use $(