diff --git a/.github/workflows/analyze.yml b/.github/workflows/analyze.yml index eef53c5..24a101d 100644 --- a/.github/workflows/analyze.yml +++ b/.github/workflows/analyze.yml @@ -19,7 +19,7 @@ jobs: - name: Run shellcheck run: | - shellcheck ./build.sh ./releasetools/cdimage.sh ./releasetools/floppyimage.sh ./releasetools/hdimages.sh ./releasetools/image.defaults ./releasetools/images.functions + shellcheck ./releasetools/cdimage.sh ./releasetools/floppyimage.sh ./releasetools/hdimages.sh ./releasetools/image.defaults ./releasetools/image.functions - name: Run CppCheck run: | diff --git a/releasetools/cdimage.sh b/releasetools/cdimage.sh index 0660e5a..85677d3 100755 --- a/releasetools/cdimage.sh +++ b/releasetools/cdimage.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -e -if [ ! -f build.sh ] +if [ ! -f Makefile ] then exit 1 fi @@ -11,3 +11,4 @@ fi DESTDIR=${BUILDDIR}/iso +make diff --git a/releasetools/floppyimage.sh b/releasetools/floppyimage.sh index abdce9b..9507f3a 100755 --- a/releasetools/floppyimage.sh +++ b/releasetools/floppyimage.sh @@ -1,10 +1,14 @@ #!/usr/bin/env bash set -e -if [ ! -f build.sh ] +if [ ! -f Makefile ] then exit 1 fi . ./releasetools/image.defaults . ./releasetools/image.functions + +DESTDIR=${BUILDDIR}/floppy + +export DESTDIR diff --git a/releasetools/hdimage.sh b/releasetools/hdimage.sh index b2bdf0d..8763de7 100755 --- a/releasetools/hdimage.sh +++ b/releasetools/hdimage.sh @@ -3,7 +3,7 @@ set -e : "${IMG=disk.img}" -if [ ! -f build.sh ] +if [ ! -f Makefile ] then exit 1 fi