install

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

commit a936ba7a7bfda878d781f3fc8a63be3d56eb9465
parent f0793658d711435b65223b4b83dff73c6bb67905
Author: Ne02ptzero <louis@ne02ptzero.me>
Date:   Fri, 16 Dec 2016 16:57:00 +0100

Fix(Install and Archives)

Diffstat:
Mpkgs/gmp_p2/gmp_p2.py | 4++--
Mpkgs/man_p2/man_p2.py | 6+++---
Mpkgs/mpfr_p2/mpfr_p2.py | 4++--
Mpkgs/zlib_p2/zlip_p2.py | 4++--
Mscreens/install/install.py | 24++++++++++++------------
5 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/pkgs/gmp_p2/gmp_p2.py b/pkgs/gmp_p2/gmp_p2.py @@ -36,14 +36,14 @@ class Gmp_P2: "name": "gmp", # Name of the package "version": "6.1.1", # Version of the package "size": 59, # Size of the installed package (MB) - "archive": "", # Archive name + "archive": "gmp-6.1.1.tar.xz", # Archive name "SBU": 1.2, # SBU (Compilation time) "tmp_install": False, # Is this package part of the temporary install "next": "mpfr", # Next package to install "before": False, "after": False, "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packages/", + "https://install.morphux.org/packages/gmp-6.1.1.tar.xz", ] } return self.config diff --git a/pkgs/man_p2/man_p2.py b/pkgs/man_p2/man_p2.py @@ -36,16 +36,16 @@ class Man_P2: "name": "man", # Name of the package "version": "4.07", # Version of the package "size": 26, # Size of the installed package (MB) - "archive": "", # Archive name + "archive": "man-pages-4.07.tar.xz", # Archive name "SBU": 0.1, # SBU (Compilation time) "tmp_install": False, # Is this package part of the temporary install - "next": False, # Next package to install + "next": "glibc", # Next package to install "before": False, "configure": False, "make": False, "after": False, "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packages/" + "https://install.morphux.org/packages/man-pages-4.07.tar.xz" ] } return self.config diff --git a/pkgs/mpfr_p2/mpfr_p2.py b/pkgs/mpfr_p2/mpfr_p2.py @@ -36,14 +36,14 @@ class Mpfr_P2: "name": "mpfr", # Name of the package "version": "3.1.4", # Version of the package "size": 45, # Size of the installed package (MB) - "archive": "", # Archive name + "archive": "mpfr-3.1.4.tar.xz", # Archive name "SBU": 0.8, # SBU (Compilation time) "tmp_install": False, # Is this package part of the temporary install "next": False, # Next package to install "before": False, "after": False, "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packages/", + "https://install.morphux.org/packages/mpfr-3.1.4.tar.xz", ] } return self.config diff --git a/pkgs/zlib_p2/zlip_p2.py b/pkgs/zlib_p2/zlip_p2.py @@ -36,13 +36,13 @@ class Zlib_P2: "name": "zlib", # Name of the package "version": "1.2.8", # Version of the package "size": 4, # Size of the installed package (MB) - "archive": "", # Archive name + "archive": "zlib-1.2.8.tar.xz", # Archive name "SBU": 0.1, # SBU (Compilation time) "tmp_install": False, # Is this package part of the temporary install "next": "file", # Next package to install "before": False, "urls": [ # Url to download the package. The first one must be morphux servers - "https://install.morphux.org/packages/" + "https://install.morphux.org/packageszlib-1.2.8.tar.xz" ] } return self.config diff --git a/screens/install/install.py b/screens/install/install.py @@ -343,8 +343,7 @@ class Install: for name, pkg in self.pkgs.items(): # Archive is not here, we need to download it. - if os.path.isfile(self.arch_dir + pkg[1]["archive"]) == False and - type(pkg[1]["archive"]) != type(False): + if type(pkg[1]["archive"]) != type(False) and os.path.isfile(self.arch_dir + pkg[1]["archive"]) == False: to_dl.append(pkg[1]) # If we got any package to download, download them. @@ -367,8 +366,9 @@ class Install: # Iterating over the packages for name, p in lst.items(): - if type(p[1]["archive"] == type(False)): + if type(p[1]["archive"]) == type(False): continue + # Update the progress bar self.dlg.gauge_update(int((unpacked * 100) / to_unpack), "Unpacking "+ p[1]["archive"] + "...", True) @@ -680,27 +680,27 @@ class Install: # Function that create the basic distribution skeleton def skeleton(path = "/"): self.dlg.infobox("Creating skeleton...") - self.exec(["mkdir", "-pv" + self.exec(["mkdir", "-pv", path + "{bin,boot,etc/{opt,sysconfig},home,lib/firmware,mnt,opt}" ], shell=True) - self.exec(["mkdir", "-pv" + self.exec(["mkdir", "-pv", path + "{media/{floppy,cdrom},sbin,srv,var}" ], shell=True) self.exec(["install", "-dv", "-m", "0750", path + "root"]) self.exec(["install", "-dv", "-m", "1777", path + "tmp", path + "var/tmp"]) - self.exec(["mkdir", "-pv" + self.exec(["mkdir", "-pv", path + "usr/{,local/}{bin,include,lib,sbin,src}" ], shell=True) - self.exec(["mkdir", "-pv" + self.exec(["mkdir", "-pv", path + "usr{,local/}share/{color,dict,doc,info,locale,man}" ], shell=True) - self.exec(["mkdir", "-pv" + self.exec(["mkdir", "-pv", path + "usr{,local/}share/{misc,terminfo,zoneinfo}" ], shell=True) - self.exec(["mkdir", "-pv" + self.exec(["mkdir", "-pv", path + "usr/libexec" ], shell=True) - self.exec(["mkdir", "-pv" + self.exec(["mkdir", "-pv", path + "usr/{,local/}share/man/man{1..8}" ], shell=True) @@ -712,7 +712,7 @@ class Install: self.exec(["mkdir", "-v", path + "var/{log,mail,spool}"], shell=True) self.exec(["ln", "-sv", path + "run", path + "var/run"]) self.exec(["ln", "-sv", path + "run/lock", path + "var/lock"]) - self.exec(["mkdir", "-pv" + self.exec(["mkdir", "-pv", path + "var/{opt,cache,lib/{color,misc,locate},local}" ], shell=True) self.exec(["mkdir", "-pv", path + "usr/local/games"]) @@ -741,7 +741,7 @@ class Install: # on the system def copy_files(self, path = "/"): directory = "defaultfiles" - files { + files = { ("passwd", "etc/passwd"), ("group", "etc/group"), ("nsswitch.conf", "etc/nsswitch.conf"),