install

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

commit 697bd211a6199d3cdeb491d07e881e1935e9aa60
parent c0c98ba0b762f2323a9437a78498fccd00418950
Author: Ne02ptzero <louis@ne02ptzero.me>
Date:   Thu, 12 Jan 2017 15:06:34 +0100

Merge branch 'master' of https://github.com/Morphux/installer

Diffstat:
Mpkgs/bzip2_p2/bzip2_p2.py | 3++-
1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/bzip2_p2/bzip2_p2.py b/pkgs/bzip2_p2/bzip2_p2.py @@ -64,6 +64,7 @@ class Bzip2_P2: self.e(["cp", "-v", "bzip2-shared", "/bin/bzip2"]) self.e(["cp", "-av", "libbz2.so.*", "/lib"], shell=True) self.e(["ln", "-sv", "../../lib/libbz2.so.1.0", "/usr/lib/libbz2.so"]) - self.e(["rm", "-v", "/usr/bin/{bunzip2,bzcat,bzip2}"], shell=True, ignore=True) + if "MERGE_USR" in self.conf_lst["config"] and self.conf_lst["config"]["MERGE_USR"] != True: + self.e(["rm", "-v", "/usr/bin/{bunzip2,bzcat,bzip2}"], shell=True, ignore=True) self.e(["ln", "-sv", "bzip2", "/bin/bunzip2"]) return self.e(["ln", "-sv", "bzip2", "/bin/bzcat"])