From 4df9d6f5ba415e00d9ccabae3698fd947bb8e69f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 11 Dec 2015 17:31:42 +0000 Subject: further steps to remove all hardcoded paths --- libvasile | 8 ++++---- vasile | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/libvasile b/libvasile index 655eda7..7d070b1 100755 --- a/libvasile +++ b/libvasile @@ -124,10 +124,10 @@ chrootstartx64 () { chrootoverlaysx64 () { echo "Injecting Kogaion Linux Main Overlay into x64 environment" sleep 1 - chroot "$overlaydir" su - "$chrootuser" -c "$chrootoverlay" + chroot "$overlaydir" su - "$chrootuser" -c "$chrootmainoverlay" echo "Injecting Kogaion Linux Desktop Overlay into x64 environment" sleep 1 - chroot "$overlaydir" su - "$chrootuser" -c "$chrootdesktopoverlay" + chroot "$overlaydir" su - "$chrootuser" -c "$chrootaddonoverlay" } chrootbuildsystemx64 () { @@ -206,10 +206,10 @@ chrootstartx86 () { chrootoverlaysx86 () { echo "Injecting Kogaion Linux Main Overlay into x86 environment" sleep 1 - linux32 chroot "$overlaydir" su - "$chrootuser" -c "$chrootoverlay" + linux32 chroot "$overlaydir" su - "$chrootuser" -c "$chrootmainoverlay" echo "Injecting Kogaion Linux Desktop Overlay into x86 environment" sleep 1 - linux32 chroot "$overlaydir" su - "$chrootuser" -c "$chrootdesktopoverlay" + linux32 chroot "$overlaydir" su - "$chrootuser" -c "$chrootaddonoverlay" } chrootbuildsystemx86 () { diff --git a/vasile b/vasile index f0256a5..b20d44b 100755 --- a/vasile +++ b/vasile @@ -18,8 +18,8 @@ export local overlaydir="overlaydir" export local chrootuser="root" export local chroottarget="${@:2}" export local chrootbuildtarget="emerge -kav "$chroottarget"" -export local chrootoverlay="layman -f -a "$releasename" -o https://gitlab.com/"$releasename"/"$releasename"-main/raw/master/overlay.xml" -export local chrootdesktopoverlay="layman -f -a "$releasename"-desktop -o https://gitlab.com/"$releasename"/"$releasename"-desktop/raw/master/overlay.xml" +export local chrootmainoverlay="layman -f -a "$releasename" -o https://gitlab.com/"$releasename"/"$releasename"-main/raw/master/overlay.xml" +export local chrootaddonoverlay="layman -f -a "$releasename"-desktop -o https://gitlab.com/"$releasename"/"$releasename"-desktop/raw/master/overlay.xml" export local chrootbuildgit="cd /opt && git clone https://gitlab.com/"$releasename"/"$releasename"-build.git" export local chrootportageconfig="ln -sf /opt/"$releasename"-build/conf/intel/portage /etc/portage" export local chrootenvupdate="/usr/sbin/env-update && . /etc/profile" -- cgit v1.2.3