Skip to content

FEATURE: /bin/sh support for configure and setup-overlay

Irkode requested to merge irkode/argononed:0.3.x-sh into 0.3.x

taking care of your comments about installation on piCore I checked on a fresh install without bash and it was not running properly.

I extracted the changes for a pure /bin/sh operation to a new branch

  • OS/_common/setup-overlay.sh
  • configure

both used !-bang /bin/bash and also some of my additions to piCore relied on bash.

Switched that to /bin/sh and adjusted some stuff to make it run again. Tested on

  • Manjaro (x86_x64
    • TARGET_DISTRO=manjaro-arm ./configure
  • on piCore (13.1 arm)
    • mount /dev/mmcblk0p1; BOOTLOC=/mnt/mmcblk0p1 ./configure
    • sudo make install

Guess you may want to test on some other OS, aswell.

Changes:

  • no warning about wrong config when doing make clean or make mrproper if makefile.conf does not exist.
  • fixed grep statement in setup-overlay.sh
    • if clause not working in bare sh
    • then and else where in wrong order
  • adjusted configure for /bin/sh
    • test -a is deprecated and not available in /bin/sh, so used -f and -c where appropriate
    • test -n VAR does not work used common practice "xVAR" == "x" instead

Detected that OS.conf missing in the OS/manjaro folder. Added a warning for that case to configure. I wonder if there is an arm variant of Manjaro with os name manjaro? Guess it's always manjaro-arm

ARGON ONE DAEMON CONFIGURING ...
Distro check [manjaro] : UNKNOWN WARNING: MISSING OS.conf, loading defaults.

Merge request reports