commit: be1d8297fc2261f430a52cef8a444deb96555c43 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> AuthorDate: Wed Jun 29 04:53:45 2016 +0000 Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> CommitDate: Wed Jun 29 05:09:12 2016 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=be1d8297
targets/*: Add shebangs for any scripts without one This is to prevent errors like: 27 Jun 2016 21:29:02 EDT: ERROR : Exception running action sequence build_kernel Traceback (most recent call last): File "/usr/lib64/python3.4/site-packages/catalyst/base/stagebase.py", line 1393, in run getattr(self, x)() File "/usr/lib64/python3.4/site-packages/catalyst/base/stagebase.py", line 1508, in build_kernel env=self.env) File "/usr/lib64/python3.4/site-packages/catalyst/support.py", line 47, in cmd proc = Popen(args, env=env) File "/usr/lib64/python3.4/subprocess.py", line 859, in __init__ restore_signals, start_new_session) File "/usr/lib64/python3.4/subprocess.py", line 1457, in _execute_child raise child_exception_type(errno_num, err_msg) OSError: [Errno 8] Exec format error targets/embedded/unmerge.sh | 1 + targets/livecd-stage1/livecd-stage1-controller.sh | 1 + targets/livecd-stage2/livecd-stage2-controller.sh | 1 + targets/support/filesystem-functions.sh | 2 ++ targets/support/functions.sh | 2 ++ targets/support/target_image_setup.sh | 1 + 6 files changed, 8 insertions(+) diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh index 9611c0a..6c55801 100755 --- a/targets/embedded/unmerge.sh +++ b/targets/embedded/unmerge.sh @@ -1,3 +1,4 @@ +#!/bin/bash ${clst_CHROOT} ${clst_chroot_path} /bin/bash << EOF ROOT=/tmp/mergeroot emerge -C $* || exit 1 diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh index 19b8dd1..7bf3bce 100755 --- a/targets/livecd-stage1/livecd-stage1-controller.sh +++ b/targets/livecd-stage1/livecd-stage1-controller.sh @@ -1,3 +1,4 @@ +#!/bin/bash source ${clst_shdir}/support/functions.sh diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh index a98cb47..10ee98e 100755 --- a/targets/livecd-stage2/livecd-stage2-controller.sh +++ b/targets/livecd-stage2/livecd-stage2-controller.sh @@ -1,3 +1,4 @@ +#!/bin/bash source ${clst_shdir}/support/functions.sh source ${clst_shdir}/support/filesystem-functions.sh diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh index 98fd5fe..0c144ba 100755 --- a/targets/support/filesystem-functions.sh +++ b/targets/support/filesystem-functions.sh @@ -1,3 +1,5 @@ +#!/bin/bash + # Dont forget to update functions.sh check_looptype # $1 is the target directory for the filesystem diff --git a/targets/support/functions.sh b/targets/support/functions.sh index f6faa61..cca2fd8 100755 --- a/targets/support/functions.sh +++ b/targets/support/functions.sh @@ -1,3 +1,5 @@ +#!/bin/bash + copy_to_chroot() { local src_file=$1 local dest_dir=${clst_chroot_path}${2:-/tmp} diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh index b428d4e..559bc56 100755 --- a/targets/support/target_image_setup.sh +++ b/targets/support/target_image_setup.sh @@ -1,3 +1,4 @@ +#!/bin/bash source ${clst_shdir}/support/functions.sh source ${clst_shdir}/support/filesystem-functions.sh