grml-desktop: appease shellcheck

Author: zeha

config/files/GRML_FULL/etc/skel/.xinitrc

@@ -6,11 +6,16 @@
 # License:       This file is licensed under the GPL v2 or any later version.
 ################################################################################
 
+# $distri is supposed to be set already
+distri=${distri:?}
+
 # configuration: by default all scripts from ~/.xinitrc.d are executed,
 # but it's possible to configure this through a configuration file
 if [ -r "$HOME/.config/${distri}/xinitrc" ] ; then
+  # shellcheck source=/dev/null
   . "$HOME/.config/${distri}/xinitrc"
 elif [ -r "$HOME/.config/grml/xinitrc" ] ; then
+  # shellcheck source=/dev/null
   . "$HOME/.config/grml/xinitrc"
 fi
 

config/files/GRML_FULL/etc/skel/.xinitrc.d/grml_keyboard

@@ -24,6 +24,7 @@ apply_xmodmap_settings() {
 if [ -r /etc/default/keyboard ] ; then # Grml >=2018.12
   XKBLAYOUT="us" # assume as default
 
+  # shellcheck source=/dev/null
   . /etc/default/keyboard
 
   if [ "${XKBLAYOUT}" = "us" ] ; then
@@ -40,6 +41,7 @@ if [ -r /etc/default/keyboard ] ; then # Grml >=2018.12
     fi
   fi
 elif [ -r /etc/sysconfig/keyboard ] ; then  # older Grml releases
+  # shellcheck source=/dev/null
   . /etc/sysconfig/keyboard
   if [ "${XKEYBOARD}" = "us" ] ; then
     apply_xmodmap_settings

config/files/GRML_FULL/etc/skel/.xinitrc.d/grml_vnc

@@ -11,10 +11,10 @@ if [ "$XINIT_GRML_VNC" = "false" ] ; then
 fi
 
 # if the vnc bootoption sets up the password let's start the vnc server
-if [ -e $HOME/.vnc/passwd ]; then
-   test -f $HOME/.vnc/options && OPTIONS=$(cat $HOME/.vnc/options)
-   /usr/bin/x11vnc -bg -forever -noxdamage -o $HOME/.vnc/x11vnc.log -rfbauth \
-                   $HOME/.vnc/passwd -auth $HOME/.Xauthority -display $DISPLAY $OPTIONS
+if [ -e "$HOME"/.vnc/passwd ]; then
+   test -f "$HOME"/.vnc/options && OPTIONS=$(cat "$HOME"/.vnc/options)
+   /usr/bin/x11vnc -bg -forever -noxdamage -o "$HOME"/.vnc/x11vnc.log -rfbauth \
+                   "$HOME"/.vnc/passwd -auth "$HOME"/.Xauthority -display "$DISPLAY" "$OPTIONS"
 fi
 
 ## END OF FILE #################################################################

config/files/GRML_FULL/etc/skel/.xinitrc.d/grml_xsettings

@@ -29,6 +29,6 @@ fi
 # xset -dpms
 
 # xresources
-  [ -r $HOME/.Xresources ] && xrdb -merge $HOME/.Xresources
+  [ -r "$HOME"/.Xresources ] && xrdb -merge "$HOME"/.Xresources
 
 ## END OF FILE #################################################################

config/files/GRML_FULL/etc/skel/.xsession

@@ -1,2 +1,3 @@
 #!/bin/sh
+# shellcheck source=/dev/null
 . ~/.xinitrc