From d97edac969415c72d0936974a503d126de337023 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Wed, 25 Jul 2012 13:23:32 +0200 Subject: [PATCH] [scripts] replace "source /etc/profile" with more POSIX-friendly ". /etc/profile" --- scripts/generic_post_iso_script.sh | 3 ++- scripts/generic_pre_iso_script.sh | 2 +- scripts/image_generic_inner_chroot_script_after.sh | 3 ++- scripts/inner_chroot_script.sh | 4 ++-- scripts/inner_source_chroot_update.sh | 5 ++--- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/scripts/generic_post_iso_script.sh b/scripts/generic_post_iso_script.sh index 7e73d78..67eddbc 100755 --- a/scripts/generic_post_iso_script.sh +++ b/scripts/generic_post_iso_script.sh @@ -8,7 +8,8 @@ # # This script requires isohybrid (which comes from syslinux package) -/usr/sbin/env-update && source /etc/profile +/usr/sbin/env-update +. /etc/profile echo echo "Spawning isohybrid for:" diff --git a/scripts/generic_pre_iso_script.sh b/scripts/generic_pre_iso_script.sh index b830ddd..3954155 100755 --- a/scripts/generic_pre_iso_script.sh +++ b/scripts/generic_pre_iso_script.sh @@ -1,7 +1,7 @@ #!/bin/bash /usr/sbin/env-update -source /etc/profile +. /etc/profile # Path to molecules.git dir SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}" diff --git a/scripts/image_generic_inner_chroot_script_after.sh b/scripts/image_generic_inner_chroot_script_after.sh index 76b81a3..7df3560 100755 --- a/scripts/image_generic_inner_chroot_script_after.sh +++ b/scripts/image_generic_inner_chroot_script_after.sh @@ -4,7 +4,8 @@ echo echo "Configuring AMI chroot" echo -/usr/sbin/env-update && source /etc/profile +/usr/sbin/env-update +. /etc/profile # setup networking, make sure networkmanager is gone rc-update del networkmanager default &> /dev/null diff --git a/scripts/inner_chroot_script.sh b/scripts/inner_chroot_script.sh index 65a1805..d207f45 100755 --- a/scripts/inner_chroot_script.sh +++ b/scripts/inner_chroot_script.sh @@ -19,8 +19,8 @@ rm -rf /root cp /etc/skel /root -Rap chown root:root /root -R -source /etc/profile -/usr/sbin/env-update && source /etc/profile +/usr/sbin/env-update +. /etc/profile # Setup locale to en_US echo LANG=\"en_US.UTF-8\" > /etc/env.d/02locale diff --git a/scripts/inner_source_chroot_update.sh b/scripts/inner_source_chroot_update.sh index 5e273b5..3b11d75 100755 --- a/scripts/inner_source_chroot_update.sh +++ b/scripts/inner_source_chroot_update.sh @@ -1,8 +1,7 @@ #!/bin/bash -source /etc/profile -env-update -source /etc/profile +/usr/sbin/env-update +. /etc/profile # Setup environment vars export ETP_NONINTERACTIVE=1