From af53d90d23fe441a9a884259eae38e7fc2affe86 Mon Sep 17 00:00:00 2001
From: Fabio Erculiani <lxnay@sabayon.org>
Date: Wed, 25 Jul 2012 13:21:49 +0200
Subject: [PATCH] [scripts] move hardcoded "/sabayon" path to
 SABAYON_MOLECULE_HOME env var

---
 iso/.keep                                     |  0
 scripts/amazon_ebs_image_remaster_post.sh     |  8 +++--
 scripts/amd64_x86_pre_iso_script.sh           | 16 ++++++----
 .../beagleboard_xm_image_generator_script.sh  |  7 +++-
 scripts/beaglebone_image_generator_script.sh  |  7 +++-
 scripts/cleanup_pkgcache.sh                   |  6 +++-
 scripts/daily_iso_build.sh                    |  6 +++-
 scripts/efikamx_image_generator_script.sh     |  6 +++-
 scripts/gaming_remaster_post.sh               |  8 +++--
 scripts/generic_pre_iso_script.sh             | 13 +++++---
 scripts/gforensic_pre_iso_script.sh           |  7 +++-
 scripts/image_remaster_post.sh                |  8 +++--
 scripts/iso_build.sh                          | 32 +++++++++++--------
 scripts/make_torrents.sh                      |  9 ++++--
 scripts/mkloopcard.sh                         | 16 ++++++----
 scripts/mmc_remaster_post.sh                  |  7 +++-
 scripts/remaster_post.sh                      |  9 ++++--
 scripts/remaster_pre.sh                       |  7 +++-
 .../tar_generic_inner_chroot_script_after.sh  |  3 +-
 scripts/weekly_iso_build.sh                   |  6 +++-
 scripts/xfce_remaster_post.sh                 | 10 ++++--
 scripts/xfceforensic_pre_iso_script.sh        |  7 +++-
 22 files changed, 144 insertions(+), 54 deletions(-)
 delete mode 100644 iso/.keep

diff --git a/iso/.keep b/iso/.keep
deleted file mode 100644
index e69de29..0000000
diff --git a/scripts/amazon_ebs_image_remaster_post.sh b/scripts/amazon_ebs_image_remaster_post.sh
index d04831f..d0f4f34 100755
--- a/scripts/amazon_ebs_image_remaster_post.sh
+++ b/scripts/amazon_ebs_image_remaster_post.sh
@@ -1,13 +1,17 @@
 #!/bin/sh
 
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
 # execute parent script
-/sabayon/scripts/remaster_post.sh
+"${SABAYON_MOLECULE_HOME}"/scripts/remaster_post.sh
 if [ "${?}" != "0" ]; then
 	exit 1
 fi
 
 # Setup provisioning script for Amazon EC2 to load at startup
-EC2_DIR="/sabayon/remaster/ec2_image"
+EC2_DIR="${SABAYON_MOLECULE_HOME}/remaster/ec2_image"
 PROV_SCRIPT="ebs.ec2.start"
 cp -p "${EC2_DIR}/${PROV_SCRIPT}" "${CHROOT_DIR}/etc/local.d/"  || exit 1
 chown root:root "${CHROOT_DIR}/etc/local.d/${PROV_SCRIPT}" || exit 1
diff --git a/scripts/amd64_x86_pre_iso_script.sh b/scripts/amd64_x86_pre_iso_script.sh
index 7c17fdc..88bfb3d 100755
--- a/scripts/amd64_x86_pre_iso_script.sh
+++ b/scripts/amd64_x86_pre_iso_script.sh
@@ -10,6 +10,10 @@ other_iso_path="${4}"
 /usr/sbin/env-update
 . /etc/profile
 
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
 pre_iso_signal_handler() {
 	if [ -d "${tmp_dir}" ] && [ -n "${tmp_dir}" ]; then
 		umount -f "${tmp_dir}"
@@ -25,7 +29,7 @@ if [ ! -f "${other_iso_path}" ]; then
 fi
 
 isolinux_destination="${CDROOT_DIR}/isolinux/txt.cfg"
-isolinux_source="/sabayon/remaster/minimal_amd64_x86_isolinux.cfg"
+isolinux_source="${SABAYON_MOLECULE_HOME}/remaster/minimal_amd64_x86_isolinux.cfg"
 cp "${isolinux_source}" "${isolinux_destination}" || exit 1
 
 ver=${RELEASE_VERSION}
@@ -70,13 +74,13 @@ cp "${tmp_dir}/boot/sabayon" "${CDROOT_DIR}/boot/sabayon${other_arch}" || exit 1
 cp "${tmp_dir}/boot/sabayon.igz" "${CDROOT_DIR}/boot/sabayon${other_arch}.igz" || exit 1
 
 # copy back.jpg to proper location
-isolinux_img="/sabayon/remaster/embedded_world/back.jpg"
+isolinux_img="${SABAYON_MOLECULE_HOME}/remaster/embedded_world/back.jpg"
 if [ -f "${isolinux_img}" ]; then
 	cp "${isolinux_img}" "${CDROOT_DIR}/isolinux/" || exit 1
 fi
 
 # copy ARM images on the ISO
-arm_images_dir="/sabayon/images"
+arm_images_dir="${SABAYON_MOLECULE_HOME}/images"
 arm_dir="${CDROOT_DIR}/ARM"
 mkdir -p "${arm_dir}" || exit 1
 
@@ -86,7 +90,7 @@ pandaboard_image="Sabayon_Linux_9_armv7a_PandaBoard_4GB.img.xz"
 
 # BeagleBone
 arm_card_dir="${arm_dir}/BeagleBone"
-arm_card_boot_dir="/sabayon/boot/arm/beaglebone"
+arm_card_boot_dir="${SABAYON_MOLECULE_HOME}/boot/arm/beaglebone"
 mkdir "${arm_card_dir}" -p || exit 1
 cp "${arm_images_dir}/${beaglebone_image}" "${arm_card_dir}"/ || exit 1
 cp "${arm_images_dir}/${beaglebone_image}.md5" "${arm_card_dir}"/ || exit 1
@@ -94,7 +98,7 @@ cp "${arm_card_boot_dir}/README.txt" "${arm_card_dir}"/ || exit 1
 
 # BeagleBoard xM
 arm_card_dir="${arm_dir}/BeagleBoard-xM"
-arm_card_boot_dir="/sabayon/boot/arm/beagleboard-xm"
+arm_card_boot_dir="${SABAYON_MOLECULE_HOME}/boot/arm/beagleboard-xm"
 mkdir "${arm_card_dir}" -p || exit 1
 cp "${arm_images_dir}/${beaglebone_image}" "${arm_card_dir}"/ || exit 1
 cp "${arm_images_dir}/${beaglebone_image}.md5" "${arm_card_dir}"/ || exit 1
@@ -102,7 +106,7 @@ cp "${arm_card_boot_dir}/README.txt" "${arm_card_dir}"/ || exit 1
 
 # PandaBoard
 arm_card_dir="${arm_dir}/PandaBoard"
-arm_card_boot_dir="/sabayon/boot/arm/pandaboard"
+arm_card_boot_dir="${SABAYON_MOLECULE_HOME}/boot/arm/pandaboard"
 mkdir "${arm_card_dir}" -p || exit 1
 cp "${arm_images_dir}/${beaglebone_image}" "${arm_card_dir}"/ || exit 1
 cp "${arm_images_dir}/${beaglebone_image}.md5" "${arm_card_dir}"/ || exit 1
diff --git a/scripts/beagleboard_xm_image_generator_script.sh b/scripts/beagleboard_xm_image_generator_script.sh
index e751949..f8bab51 100755
--- a/scripts/beagleboard_xm_image_generator_script.sh
+++ b/scripts/beagleboard_xm_image_generator_script.sh
@@ -1,4 +1,9 @@
 #!/bin/sh
+
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
 # rootfs and bootfs tarball is generated by beaglebone image
 export MAKE_TARBALL="0"
-exec /sabayon/scripts/mkloopcard.sh /sabayon/scripts/mkloopcard_beagleboard_xm_chroot_hook.sh "$@"
+exec "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard.sh "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard_beagleboard_xm_chroot_hook.sh "$@"
diff --git a/scripts/beaglebone_image_generator_script.sh b/scripts/beaglebone_image_generator_script.sh
index af682c8..3893917 100755
--- a/scripts/beaglebone_image_generator_script.sh
+++ b/scripts/beaglebone_image_generator_script.sh
@@ -1,2 +1,7 @@
 #!/bin/sh
-exec /sabayon/scripts/mkloopcard.sh /sabayon/scripts/mkloopcard_beaglebone_chroot_hook.sh "$@"
+
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
+exec "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard.sh "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard_beaglebone_chroot_hook.sh "$@"
diff --git a/scripts/cleanup_pkgcache.sh b/scripts/cleanup_pkgcache.sh
index 57bf129..8cc349f 100755
--- a/scripts/cleanup_pkgcache.sh
+++ b/scripts/cleanup_pkgcache.sh
@@ -2,5 +2,9 @@
 # Remove tarballs not accessed in the last 30 days
 # concurrency wrt scripts is handled in crontab
 
-DIR="/sabayon/pkgcache"
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
+DIR="${SABAYON_MOLECULE_HOME}/pkgcache"
 find "${DIR}" -atime +30 -type f -delete
diff --git a/scripts/daily_iso_build.sh b/scripts/daily_iso_build.sh
index ffb6ecd..349ec26 100755
--- a/scripts/daily_iso_build.sh
+++ b/scripts/daily_iso_build.sh
@@ -1,3 +1,7 @@
 #!/bin/bash
 
-exec /sabayon/scripts/iso_build.sh "daily" "$@"
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
+exec "${SABAYON_MOLECULE_HOME}"/scripts/iso_build.sh "daily" "$@"
diff --git a/scripts/efikamx_image_generator_script.sh b/scripts/efikamx_image_generator_script.sh
index 7cfd3b9..584576b 100755
--- a/scripts/efikamx_image_generator_script.sh
+++ b/scripts/efikamx_image_generator_script.sh
@@ -7,4 +7,8 @@ export BOOT_PART_TYPE_INSIDE_ROOT=1
 export ROOT_PART_TYPE=ext4
 export MAKE_TARBALL=0
 
-exec /sabayon/scripts/mkloopcard.sh /sabayon/scripts/mkloopcard_efikamx_chroot_hook.sh "$@"
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
+exec "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard.sh "${SABAYON_MOLECULE_HOME}"/scripts/mkloopcard_efikamx_chroot_hook.sh "$@"
diff --git a/scripts/gaming_remaster_post.sh b/scripts/gaming_remaster_post.sh
index 7b4811c..11c77ab 100755
--- a/scripts/gaming_remaster_post.sh
+++ b/scripts/gaming_remaster_post.sh
@@ -1,10 +1,14 @@
 #!/bin/sh
 
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
 # execute parent script
-/sabayon/scripts/remaster_post.sh $@
+"${SABAYON_MOLECULE_HOME}"/scripts/remaster_post.sh "$@"
 
 # Christmas TIME !
-GAMING_XMAS_DIR="/sabayon/remaster/gaming-xmas"
+GAMING_XMAS_DIR="${SABAYON_MOLECULE_HOME}/remaster/gaming-xmas"
 cp "${GAMING_XMAS_DIR}"/sabayonlinux.png "${CHROOT_DIR}/usr/share/backgrounds/sabayonlinux.png"
 cp "${GAMING_XMAS_DIR}"/sabayonlinux.jpg "${CHROOT_DIR}/usr/share/backgrounds/sabayonlinux.jpg"
 cp "${GAMING_XMAS_DIR}"/sabayonlinux.jpg "${CHROOT_DIR}/usr/share/backgrounds/kgdm.jpg"
diff --git a/scripts/generic_pre_iso_script.sh b/scripts/generic_pre_iso_script.sh
index 1b77946..b830ddd 100755
--- a/scripts/generic_pre_iso_script.sh
+++ b/scripts/generic_pre_iso_script.sh
@@ -1,20 +1,25 @@
 #!/bin/bash
 
-/usr/sbin/env-update && source /etc/profile
+/usr/sbin/env-update
+source /etc/profile
+
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
 
 remaster_type="${1}"
-isolinux_source="/sabayon/remaster/minimal_isolinux.cfg"
+isolinux_source="${SABAYON_MOLECULE_HOME}/remaster/minimal_isolinux.cfg"
 isolinux_destination="${CDROOT_DIR}/isolinux/txt.cfg"
 
 if [ "${remaster_type}" = "KDE" ] || [ "${remaster_type}" = "GNOME" ]; then
-	isolinux_source="/sabayon/remaster/standard_isolinux.cfg"
+	isolinux_source="${SABAYON_MOLECULE_HOME}/remaster/standard_isolinux.cfg"
 elif [ "${remaster_type}" = "ServerBase" ]; then
 	echo "ServerBase trigger, copying server kernel over"
 	boot_kernel=$(find "${CHROOT_DIR}/boot" -name "kernel-*" | sort | head -n 1)
 	boot_ramfs=$(find "${CHROOT_DIR}/boot" -name "initramfs-*" | sort | head -n 1)
 	cp "${boot_kernel}" "${CDROOT_DIR}/boot/sabayon" || exit 1
 	cp "${boot_ramfs}" "${CDROOT_DIR}/boot/sabayon.igz" || exit 1
-	isolinux_source="/sabayon/remaster/serverbase_isolinux.cfg"
+	isolinux_source="${SABAYON_MOLECULE_HOME}/remaster/serverbase_isolinux.cfg"
 fi
 cp "${isolinux_source}" "${isolinux_destination}" || exit 1
 
diff --git a/scripts/gforensic_pre_iso_script.sh b/scripts/gforensic_pre_iso_script.sh
index df3051c..1489fe7 100755
--- a/scripts/gforensic_pre_iso_script.sh
+++ b/scripts/gforensic_pre_iso_script.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
-GFORENSIC_DIR="/sabayon/remaster/gforensic"
+
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
+GFORENSIC_DIR="${SABAYON_MOLECULE_HOME}/remaster/gforensic"
 cp "${GFORENSIC_DIR}"/isolinux/isolinux.cfg "${CDROOT_DIR}/isolinux/txt.cfg"
 cp "${GFORENSIC_DIR}"/isolinux/back.jpg "${CDROOT_DIR}/isolinux/back.jpg"
 cp "${GFORENSIC_DIR}"/isolinux/isolinux.txt "${CDROOT_DIR}/isolinux/isolinux.txt"
diff --git a/scripts/image_remaster_post.sh b/scripts/image_remaster_post.sh
index 5dc4c11..f582d9a 100755
--- a/scripts/image_remaster_post.sh
+++ b/scripts/image_remaster_post.sh
@@ -1,13 +1,17 @@
 #!/bin/sh
 
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
 # execute parent script
-/sabayon/scripts/remaster_post.sh
+"${SABAYON_MOLECULE_HOME}"/scripts/remaster_post.sh
 if [ "${?}" != "0" ]; then
 	exit 1
 fi
 
 # Setup provisioning script for Amazon EC2 to load at startup
-EC2_DIR="/sabayon/remaster/ec2_image"
+EC2_DIR="${SABAYON_MOLECULE_HOME}/remaster/ec2_image"
 PROV_SCRIPT="ec2.start"
 cp -p "${EC2_DIR}/${PROV_SCRIPT}" "${CHROOT_DIR}/etc/local.d/"  || exit 1
 chown root:root "${CHROOT_DIR}/etc/local.d/${PROV_SCRIPT}" || exit 1
diff --git a/scripts/iso_build.sh b/scripts/iso_build.sh
index 59001fc..d8dea2c 100755
--- a/scripts/iso_build.sh
+++ b/scripts/iso_build.sh
@@ -1,5 +1,9 @@
 #!/bin/bash
 
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
 ACTION="${1}"
 if [ "${ACTION}" != "daily" ] && [ "${ACTION}" != "weekly" ]; then
 	echo "invalid action: ${ACTION}" >&2
@@ -140,14 +144,14 @@ cleanup_on_exit() {
 trap "cleanup_on_exit" EXIT INT TERM
 
 move_to_pkg_sabayon_org() {
-	if [ -n "${DO_PUSH}" ] || [ -f /sabayon/DO_PUSH ]; then
-		rm -f /sabayon/DO_PUSH
+	if [ -n "${DO_PUSH}" ] || [ -f "${SABAYON_MOLECULE_HOME}"/DO_PUSH ]; then
+		rm -f "${SABAYON_MOLECULE_HOME}"/DO_PUSH
 		local executed=
 		for ((i=0; i < 5; i++)); do
-			rsync -av --partial --delete-excluded /sabayon/iso_rsync/*DAILY* \
+			rsync -av --partial --delete-excluded "${SABAYON_MOLECULE_HOME}"/iso_rsync/*DAILY* \
 				entropy@pkg.sabayon.org:/sabayon/rsync/rsync.sabayon.org/iso/daily \
 				|| { sleep 10; continue; }
-			rsync -av --partial --delete-excluded /sabayon/scripts/gen_html \
+			rsync -av --partial --delete-excluded "${SABAYON_MOLECULE_HOME}"/scripts/gen_html \
 			entropy@pkg.sabayon.org:/sabayon/rsync/iso_html_generator \
 				|| { sleep 10; continue; }
 			ssh entropy@pkg.sabayon.org \
@@ -173,11 +177,11 @@ build_sabayon() {
 		local source_specs=""
 		for i in ${!SOURCE_SPECS[@]}
 		do
-			src="/sabayon/molecules/${SOURCE_SPECS[i]}"
+			src="${SABAYON_MOLECULE_HOME}/molecules/${SOURCE_SPECS[i]}"
 			dst="${DAILY_TMPDIR}/${SOURCE_SPECS[i]}"
 			cp "${src}" "${dst}" -p || return 1
 			echo >> "${dst}"
-			echo "inner_source_chroot_script: /sabayon/scripts/inner_source_chroot_update.sh" >> "${dst}"
+			echo "inner_source_chroot_script: ${SABAYON_MOLECULE_HOME}/scripts/inner_source_chroot_update.sh" >> "${dst}"
 			# tweak iso image name
 			sed -i "s/^#.*destination_iso_image_name/destination_iso_image_name:/" "${dst}" || return 1
 			sed -i "s/destination_iso_image_name.*/destination_iso_image_name: ${SOURCE_SPECS_ISO[i]}/" "${dst}" || return 1
@@ -190,11 +194,11 @@ build_sabayon() {
 		local arm_source_specs=""
 		for i in ${!ARM_SOURCE_SPECS[@]}
 		do
-			src="/sabayon/molecules/${ARM_SOURCE_SPECS[i]}"
+			src="${SABAYON_MOLECULE_HOME}/molecules/${ARM_SOURCE_SPECS[i]}"
 			dst="${DAILY_TMPDIR}/${ARM_SOURCE_SPECS[i]}"
 			cp "${src}" "${dst}" -p || return 1
 			echo >> "${dst}"
-			echo "inner_source_chroot_script: /sabayon/scripts/inner_source_chroot_update.sh" >> "${dst}"
+			echo "inner_source_chroot_script: ${SABAYON_MOLECULE_HOME}/scripts/inner_source_chroot_update.sh" >> "${dst}"
 			# tweak iso image name
 			sed -i "s/^#.*image_name/image_name:/" "${dst}" || return 1
 			sed -i "s/image_name.*/image_name: ${ARM_SOURCE_SPECS_IMG[i]}/" "${dst}" || return 1
@@ -207,7 +211,7 @@ build_sabayon() {
 		local remaster_specs=""
 		for i in ${!REMASTER_SPECS[@]}
 		do
-			src="/sabayon/molecules/${REMASTER_SPECS[i]}"
+			src="${SABAYON_MOLECULE_HOME}/molecules/${REMASTER_SPECS[i]}"
 			dst="${DAILY_TMPDIR_REMASTER}/${REMASTER_SPECS[i]}"
 			cp "${src}" "${dst}" -p || return 1
 			# tweak iso image name
@@ -221,7 +225,7 @@ build_sabayon() {
 
 		for i in ${!REMASTER_TAR_SPECS[@]}
 		do
-			src="/sabayon/molecules/${REMASTER_TAR_SPECS[i]}"
+			src="${SABAYON_MOLECULE_HOME}/molecules/${REMASTER_TAR_SPECS[i]}"
 			dst="${DAILY_TMPDIR_REMASTER}/${REMASTER_TAR_SPECS[i]}"
 			cp "${src}" "${dst}" -p || return 1
 			# tweak tar name
@@ -254,12 +258,12 @@ build_sabayon() {
 
 		if [ "${done_something}" = "1" ]; then
 			if [ "${done_images}" = "1" ]; then
-				cp -p /sabayon/images/*DAILY* /sabayon/iso_rsync/ || return 1
+				cp -p "${SABAYON_MOLECULE_HOME}"/images/*DAILY* "${SABAYON_MOLECULE_HOME}"/iso_rsync/ || return 1
 			fi
-			cp -p /sabayon/iso/*DAILY* /sabayon/iso_rsync/ || return 1
-			date > /sabayon/iso_rsync/RELEASE_DATE_DAILY
+			cp -p "${SABAYON_MOLECULE_HOME}"/iso/*DAILY* "${SABAYON_MOLECULE_HOME}"/iso_rsync/ || return 1
+			date > "${SABAYON_MOLECULE_HOME}"/iso_rsync/RELEASE_DATE_DAILY
 			if [ "${MAKE_TORRENTS}" != "0" ]; then
-				/sabayon/scripts/make_torrents.sh || return 1
+				"${SABAYON_MOLECULE_HOME}"/scripts/make_torrents.sh || return 1
 			fi
 		fi
 	fi
diff --git a/scripts/make_torrents.sh b/scripts/make_torrents.sh
index baf0cda..11992fe 100755
--- a/scripts/make_torrents.sh
+++ b/scripts/make_torrents.sh
@@ -1,9 +1,14 @@
 #!/bin/sh
 
-/usr/sbin/env-update && source /etc/profile
+/usr/sbin/env-update
+. /etc/profile
+
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
 
 announce_url="http://tracker.sabayon.org/tracker.php/announce"
-iso_dir="/sabayon/iso"
+iso_dir="${SABAYON_MOLECULE_HOME}/iso"
 cd "${iso_dir}"
 
 for iso_file in "${iso_dir}"/*.{iso,tar.gz,tar.xz}; do
diff --git a/scripts/mkloopcard.sh b/scripts/mkloopcard.sh
index 68047d4..2f1b59d 100755
--- a/scripts/mkloopcard.sh
+++ b/scripts/mkloopcard.sh
@@ -5,7 +5,11 @@
 env-update
 . /etc/profile
 
-export LC_ALL=C
+export LC_ALL=en_US.UTF-8
+
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
 
 # Expected env variables:
 # PATHS_TO_REMOVE = ";" separated list of paths to rm -rf
@@ -60,7 +64,7 @@ cleanup_loopbacks() {
 	[[ -n "${root_part}" ]] && losetup -d "${root_part}" 2> /dev/null
 	[[ -n "${DRIVE}" ]] && losetup -d "${DRIVE}" 2> /dev/null
 	# make sure to have run this
-	[[ -n "${tmp_dir}" ]] && CHROOT_DIR="${tmp_dir}" /sabayon/scripts/mmc_remaster_post.sh
+	[[ -n "${tmp_dir}" ]] && CHROOT_DIR="${tmp_dir}" "${SABAYON_MOLECULE_HOME}"/scripts/mmc_remaster_post.sh
 }
 trap "cleanup_loopbacks" 1 2 3 6 9 14 15 EXIT
 
@@ -95,7 +99,7 @@ echo "Start offset : ${STARTOFFSET} bytes"
 {
 echo ,9,${BOOT_PART_TYPE_MBR},*
 echo ,,,-
-} | sfdisk -D -H 255 -S 63 -C $CYLINDERS $DRIVE
+} | sfdisk -D -H 255 -S 63 -C ${CYLINDERS} ${DRIVE}
 
 sleep 2
 
@@ -159,10 +163,10 @@ mount "${root_part}" "${tmp_dir}"
 rsync -a -H -A -X --delete-during "${CHROOT_DIR}"/ "${tmp_dir}"/ --exclude "/proc/*" --exclude "/sys/*" \
 	--exclude "/dev/pts/*" --exclude "/dev/shm/*" || exit 1
 
-CHROOT_DIR="${tmp_dir}" /sabayon/scripts/remaster_pre.sh || exit 1
+CHROOT_DIR="${tmp_dir}" "${SABAYON_MOLECULE_HOME}"/scripts/remaster_pre.sh || exit 1
 
 # Configure 00-board-setup.start
-source_board_setup="/sabayon/boot/arm_startup/00-board-setup.start"
+source_board_setup="${SABAYON_MOLECULE_HOME}/boot/arm_startup/00-board-setup.start"
 dest_board_setup="${CHROOT_DIR}/etc/local.d/00-board-setup.start"
 if [ -f "${source_board_setup}" ]; then
 	echo "Setting up ${dest_board_setup}"
@@ -204,7 +208,7 @@ chown root "${target_chroot_script}" || exit 1
 chroot "${tmp_dir}" "/${chroot_script_name}" || exit 1
 rm -f "${target_chroot_script}"
 
-CHROOT_DIR="${tmp_dir}" /sabayon/scripts/mmc_remaster_post.sh
+CHROOT_DIR="${tmp_dir}" "${SABAYON_MOLECULE_HOME}"/scripts/mmc_remaster_post.sh
 
 # execute final cleanup of entropy stuff
 chroot "${tmp_dir}" equo rescue vacuum
diff --git a/scripts/mmc_remaster_post.sh b/scripts/mmc_remaster_post.sh
index 37d3705..36e0090 100755
--- a/scripts/mmc_remaster_post.sh
+++ b/scripts/mmc_remaster_post.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
-PKGS_DIR="/sabayon/pkgcache"
+
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
+PKGS_DIR="${SABAYON_MOLECULE_HOME}/pkgcache"
 CHROOT_PKGS_DIR="${CHROOT_DIR}/var/lib/entropy/client/packages"
 
 # remove entropy hwash
diff --git a/scripts/remaster_post.sh b/scripts/remaster_post.sh
index 26dae0d..9df0915 100755
--- a/scripts/remaster_post.sh
+++ b/scripts/remaster_post.sh
@@ -1,9 +1,14 @@
 #!/bin/sh
-PKGS_DIR="/sabayon/pkgcache"
+
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
+PKGS_DIR="${SABAYON_MOLECULE_HOME}/pkgcache"
 CHROOT_PKGS_DIR="${CHROOT_DIR}/var/lib/entropy/client/packages"
 
 # load common stuff
-. /sabayon/scripts/remaster_post_common.sh
+. "${SABAYON_MOLECULE_HOME}"/scripts/remaster_post_common.sh
 
 # make sure to not leak /proc
 umount "${CHROOT_DIR}/proc" &> /dev/null
diff --git a/scripts/remaster_pre.sh b/scripts/remaster_pre.sh
index fea3482..32f1d67 100755
--- a/scripts/remaster_pre.sh
+++ b/scripts/remaster_pre.sh
@@ -1,5 +1,10 @@
 #!/bin/sh
-PKGS_DIR="/sabayon/pkgcache"
+
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
+PKGS_DIR="${SABAYON_MOLECULE_HOME}/pkgcache"
 CHROOT_PKGS_DIR="${CHROOT_DIR}/var/lib/entropy/client/packages"
 
 [[ ! -d "${PKGS_DIR}" ]] && mkdir -p "${PKGS_DIR}"
diff --git a/scripts/tar_generic_inner_chroot_script_after.sh b/scripts/tar_generic_inner_chroot_script_after.sh
index 34848fc..becaaac 100755
--- a/scripts/tar_generic_inner_chroot_script_after.sh
+++ b/scripts/tar_generic_inner_chroot_script_after.sh
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-/usr/sbin/env-update && source /etc/profile
+/usr/sbin/env-update
+. /etc/profile
 
 # remove sabayonuser
 userdel sabayonuser
diff --git a/scripts/weekly_iso_build.sh b/scripts/weekly_iso_build.sh
index d6bc105..f5a2f36 100755
--- a/scripts/weekly_iso_build.sh
+++ b/scripts/weekly_iso_build.sh
@@ -1,3 +1,7 @@
 #!/bin/bash
 
-exec /sabayon/scripts/iso_build.sh "weekly" "$@"
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
+exec "${SABAYON_MOLECULE_HOME}"/scripts/iso_build.sh "weekly" "$@"
diff --git a/scripts/xfce_remaster_post.sh b/scripts/xfce_remaster_post.sh
index ecd469a..297b83b 100755
--- a/scripts/xfce_remaster_post.sh
+++ b/scripts/xfce_remaster_post.sh
@@ -1,9 +1,13 @@
 #!/bin/sh
 
-# execute parent script
-/sabayon/scripts/remaster_post.sh
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
 
-GFORENSIC_DIR="/sabayon/remaster/gforensic"
+# execute parent script
+"${SABAYON_MOLECULE_HOME}"/scripts/remaster_post.sh
+
+GFORENSIC_DIR="${SABAYON_MOLECULE_HOME}/remaster/gforensic"
 # setup skel and background
 cp "${GFORENSIC_DIR}"/usr/share/backgrounds/sabayon-forensic.png "${CHROOT_DIR}/usr/share/backgrounds/sabayonlinux.png"
 cp "${GFORENSIC_DIR}"/usr/share/backgrounds/sabayon-forensic.jpg "${CHROOT_DIR}/usr/share/backgrounds/sabayonlinux.jpg"
diff --git a/scripts/xfceforensic_pre_iso_script.sh b/scripts/xfceforensic_pre_iso_script.sh
index df3051c..1489fe7 100755
--- a/scripts/xfceforensic_pre_iso_script.sh
+++ b/scripts/xfceforensic_pre_iso_script.sh
@@ -1,5 +1,10 @@
 #!/bin/bash
-GFORENSIC_DIR="/sabayon/remaster/gforensic"
+
+# Path to molecules.git dir
+SABAYON_MOLECULE_HOME="${SABAYON_MOLECULE_HOME:-/sabayon}"
+export SABAYON_MOLECULE_HOME
+
+GFORENSIC_DIR="${SABAYON_MOLECULE_HOME}/remaster/gforensic"
 cp "${GFORENSIC_DIR}"/isolinux/isolinux.cfg "${CDROOT_DIR}/isolinux/txt.cfg"
 cp "${GFORENSIC_DIR}"/isolinux/back.jpg "${CDROOT_DIR}/isolinux/back.jpg"
 cp "${GFORENSIC_DIR}"/isolinux/isolinux.txt "${CDROOT_DIR}/isolinux/isolinux.txt"