install

installer
Log | Files | Refs | README | LICENSE | git clone https://git.ne02ptzero.me/git/install

commit e977b7e2933139bbd4bf662eeaff225d18a967ec
parent 90ef36d2107b9b0797b8e32c8f3eba479858a41e
Author: Ne02ptzero <louis@ne02ptzero.me>
Date:   Wed,  4 Jan 2017 17:52:22 +0100

Fix(Coreutils): Wrong return & No copy on MERGED_USR

Diffstat:
Mpkgs/coreutils_p2/coreutils_p2.py | 15++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/pkgs/coreutils_p2/coreutils_p2.py b/pkgs/coreutils_p2/coreutils_p2.py @@ -48,7 +48,7 @@ class Coreutils_P2: return self.config def before(self): - self.e(["patch", "-Np1", "-i", "../coreutils-8.25-i18n-2.patch"]) + return self.e(["patch", "-Np1", "-i", "../coreutils-8.25-i18n-2.patch"]) def configure(self): os.environ["FORCE_UNSAFE_CONFIGURE"] = "1" @@ -62,10 +62,11 @@ class Coreutils_P2: def install(self): self.e(["make", "install"]) - self.e(["mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin"], shell=True) - self.e(["mv -v /usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} /bin"], shell=True) - self.e(["mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin"], shell=True) - self.e(["mv -v /usr/bin/chroot /usr/sbin"], shell=True) + if "MERGE_USR" in self.conf_lst["config"] and self.conf_lst["config"]["MERGE_USR"] != True: + self.e(["mv -v /usr/bin/{cat,chgrp,chmod,chown,cp,date,dd,df,echo} /bin"], shell=True) + self.e(["mv -v /usr/bin/{false,ln,ls,mkdir,mknod,mv,pwd,rm} /bin"], shell=True) + self.e(["mv -v /usr/bin/{rmdir,stty,sync,true,uname} /bin"], shell=True) + self.e(["mv -v /usr/bin/chroot /usr/sbin"], shell=True) + self.e(["mv -v /usr/bin/{head,sleep,nice,test,[} /bin"], shell=True) self.e(["mv -v /usr/share/man/man1/chroot.1 /usr/share/man/man8/chroot.8"], shell=True) - self.e(["sed -i s/\"1\"/\"8\"/1 /usr/share/man/man8/chroot.8"], shell=True) - self.e(["mv -v /usr/bin/{head,sleep,nice,test,[} /bin"], shell=True) + return self.e(["sed -i s/\"1\"/\"8\"/1 /usr/share/man/man8/chroot.8"], shell=True)