Update repo to archlinux/archinstall
This commit is contained in:
parent
ef021698b6
commit
5a321d6ce5
|
|
@ -6,7 +6,7 @@ Therefore guidelines and style changes to the code might come into affect as wel
|
||||||
|
|
||||||
## Discussions
|
## Discussions
|
||||||
|
|
||||||
Currently, questions, bugs and suggestions should be reported through [GitHub issue tracker](https://github.com/Torxed/archinstall/issues).<br>
|
Currently, questions, bugs and suggestions should be reported through [GitHub issue tracker](https://github.com/archlinux/archinstall/issues).<br>
|
||||||
For less formal discussions there are also a [archinstall Discord server](https://discord.gg/cqXU88y).
|
For less formal discussions there are also a [archinstall Discord server](https://discord.gg/cqXU88y).
|
||||||
|
|
||||||
## Coding convention
|
## Coding convention
|
||||||
|
|
|
||||||
2
PKGBUILD
2
PKGBUILD
|
|
@ -8,7 +8,7 @@ pkgver=$(git describe --long | sed 's/\([^-]*-g\)/r\1/;s/-/./g')
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc="Just another guided/automated Arch Linux installer with a twist"
|
pkgdesc="Just another guided/automated Arch Linux installer with a twist"
|
||||||
arch=('any')
|
arch=('any')
|
||||||
url="https://github.com/Torxed/archinstall"
|
url="https://github.com/archlinux/archinstall"
|
||||||
license=('GPL')
|
license=('GPL')
|
||||||
depends=('python')
|
depends=('python')
|
||||||
makedepends=('python-setuptools')
|
makedepends=('python-setuptools')
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,11 @@ pkgname="archinstall-bin"
|
||||||
pkgver="2.1.3"
|
pkgver="2.1.3"
|
||||||
pkgdesc="Installs a pre-built binary of ${pkgname}"
|
pkgdesc="Installs a pre-built binary of ${pkgname}"
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
url="https://github.com/Torxed/archinstall"
|
url="https://github.com/archlinux/archinstall"
|
||||||
license=('GPLv3')
|
license=('GPLv3')
|
||||||
provides=("${pkgname}")
|
provides=("${pkgname}")
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
source=("${pkgname}-v${pkgver}-x86_64.tar.gz::https://github.com/Torxed/archinstall/archive/v$pkgver.tar.gz")
|
source=("${pkgname}-v${pkgver}-x86_64.tar.gz::https://github.com/archlinux/archinstall/archive/v$pkgver.tar.gz")
|
||||||
#depends=('python>=3.8')
|
#depends=('python>=3.8')
|
||||||
makedepends=('python>=3.8' 'nuitka')
|
makedepends=('python>=3.8' 'nuitka')
|
||||||
optdepends=('pyttsx3: Adds text-to-speach support for log/screen output.')
|
optdepends=('pyttsx3: Adds text-to-speach support for log/screen output.')
|
||||||
|
|
|
||||||
|
|
@ -5,11 +5,11 @@ pkgname="archinstall"
|
||||||
pkgver="2.1.3"
|
pkgver="2.1.3"
|
||||||
pkgdesc="Installs launcher scripts for archinstall"
|
pkgdesc="Installs launcher scripts for archinstall"
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
url="https://github.com/Torxed/archinstall"
|
url="https://github.com/archlinux/archinstall"
|
||||||
license=('GPLv3')
|
license=('GPLv3')
|
||||||
provides=("${pkgname}")
|
provides=("${pkgname}")
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
source=("${pkgname}-v${pkgver}-x86_64.tar.gz::https://github.com/Torxed/archinstall/archive/v$pkgver.tar.gz")
|
source=("${pkgname}-v${pkgver}-x86_64.tar.gz::https://github.com/archlinux/archinstall/archive/v$pkgver.tar.gz")
|
||||||
depends=('python-archinstall')
|
depends=('python-archinstall')
|
||||||
sha256sums=('53c00f7e7ad245cd2cbbf041b5a735df2fc29454c24b1d369f678cc0610b7cea')
|
sha256sums=('53c00f7e7ad245cd2cbbf041b5a735df2fc29454c24b1d369f678cc0610b7cea')
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -5,8 +5,8 @@ pkgname="python-archinstall"
|
||||||
pkgver="2.1.3"
|
pkgver="2.1.3"
|
||||||
pkgdesc="Installs ${pkgname} as a python library."
|
pkgdesc="Installs ${pkgname} as a python library."
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
url="https://github.com/Torxed/archinstall"
|
url="https://github.com/archlinux/archinstall"
|
||||||
source=("${pkgname}-v${pkgver}-x86_64.tar.gz::https://github.com/Torxed/archinstall/archive/v$pkgver.tar.gz")
|
source=("${pkgname}-v${pkgver}-x86_64.tar.gz::https://github.com/archlinux/archinstall/archive/v$pkgver.tar.gz")
|
||||||
license=('GPLv3')
|
license=('GPLv3')
|
||||||
provides=("${pkgname}")
|
provides=("${pkgname}")
|
||||||
arch=('x86_64')
|
arch=('x86_64')
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
# <img src="https://github.com/Torxed/archinstall/raw/master/docs/logo.png" alt="drawing" width="200"/>
|
# <img src="https://github.com/archlinux/archinstall/raw/master/docs/logo.png" alt="drawing" width="200"/>
|
||||||
Just another guided/automated [Arch Linux](https://wiki.archlinux.org/index.php/Arch_Linux) installer with a twist.
|
Just another guided/automated [Arch Linux](https://wiki.archlinux.org/index.php/Arch_Linux) installer with a twist.
|
||||||
The installer also doubles as a python library to install Arch Linux and manage services, packages and other things inside the installed system *(Usually from a live medium)*.
|
The installer also doubles as a python library to install Arch Linux and manage services, packages and other things inside the installed system *(Usually from a live medium)*.
|
||||||
|
|
||||||
|
|
@ -62,7 +62,7 @@ This installer will perform the following:
|
||||||
* Installs a basic instance of Arch Linux *(base base-devel linux linux-firmware btrfs-progs efibootmgr)*
|
* Installs a basic instance of Arch Linux *(base base-devel linux linux-firmware btrfs-progs efibootmgr)*
|
||||||
* Installs and configures a bootloader to partition 0.
|
* Installs and configures a bootloader to partition 0.
|
||||||
* Install additional packages *(nano, wget, git)*
|
* Install additional packages *(nano, wget, git)*
|
||||||
* Installs a network-profile called [awesome](https://github.com/Torxed/archinstall/blob/master/profiles/awesome.py) *(more on network profiles in the documentation)*
|
* Installs a network-profile called [awesome](https://github.com/archlinux/archinstall/blob/master/profiles/awesome.py) *(more on network profiles in the documentation)*
|
||||||
|
|
||||||
> **Creating your own ISO with this script on it:** Follow [ArchISO](https://wiki.archlinux.org/index.php/archiso)'s guide on how to create your own ISO or use a pre-built [guided ISO](https://hvornum.se/archiso/) to skip the python installation step, or to create auto-installing ISO templates. Further down are examples and cheat sheets on how to create different live ISO's.
|
> **Creating your own ISO with this script on it:** Follow [ArchISO](https://wiki.archlinux.org/index.php/archiso)'s guide on how to create your own ISO or use a pre-built [guided ISO](https://hvornum.se/archiso/) to skip the python installation step, or to create auto-installing ISO templates. Further down are examples and cheat sheets on how to create different live ISO's.
|
||||||
|
|
||||||
|
|
@ -87,5 +87,5 @@ This will create a *5GB* `testimage.img` and create a loop device which we can u
|
||||||
`archinstall` is installed and executed in [guided mode](#docs-todo). Once the installation is complete,<br>
|
`archinstall` is installed and executed in [guided mode](#docs-todo). Once the installation is complete,<br>
|
||||||
~~you can use qemu/kvm to boot the test media.~~ *(You'd actually need to do some EFI magic in order to point the EFI vars to the partition 0 in the test medium so this won't work entirely out of the box, but gives you a general idea of what we're going for here)*
|
~~you can use qemu/kvm to boot the test media.~~ *(You'd actually need to do some EFI magic in order to point the EFI vars to the partition 0 in the test medium so this won't work entirely out of the box, but gives you a general idea of what we're going for here)*
|
||||||
|
|
||||||
There's also a [Building and Testing](https://github.com/Torxed/archinstall/wiki/Building-and-Testing) guide.<br>
|
There's also a [Building and Testing](https://github.com/archlinux/archinstall/wiki/Building-and-Testing) guide.<br>
|
||||||
It will go through everything from packaging, building and running *(with qemu)* the installer against a dev branch.
|
It will go through everything from packaging, building and running *(with qemu)* the installer against a dev branch.
|
||||||
|
|
|
||||||
|
|
@ -85,7 +85,7 @@ class Installer():
|
||||||
# We avoid printing /mnt/<log path> because that might confuse people if they note it down
|
# We avoid printing /mnt/<log path> because that might confuse people if they note it down
|
||||||
# and then reboot, and a identical log file will be found in the ISO medium anyway.
|
# and then reboot, and a identical log file will be found in the ISO medium anyway.
|
||||||
print(f"[!] A log file has been created here: {os.path.join(storage['LOG_PATH'], storage['LOG_FILE'])}")
|
print(f"[!] A log file has been created here: {os.path.join(storage['LOG_PATH'], storage['LOG_FILE'])}")
|
||||||
print(f" Please submit this issue (and file) to https://github.com/Torxed/archinstall/issues")
|
print(f" Please submit this issue (and file) to https://github.com/archlinux/archinstall/issues")
|
||||||
raise args[1]
|
raise args[1]
|
||||||
|
|
||||||
self.genfstab()
|
self.genfstab()
|
||||||
|
|
@ -99,7 +99,7 @@ class Installer():
|
||||||
for step in missing_steps:
|
for step in missing_steps:
|
||||||
self.log(f' - {step}', bg='black', fg='red', level=LOG_LEVELS.Warning)
|
self.log(f' - {step}', bg='black', fg='red', level=LOG_LEVELS.Warning)
|
||||||
self.log(f"Detailed error logs can be found at: {log_path}", level=LOG_LEVELS.Warning)
|
self.log(f"Detailed error logs can be found at: {log_path}", level=LOG_LEVELS.Warning)
|
||||||
self.log(f"Submit this zip file as an issue to https://github.com/Torxed/archinstall/issues", level=LOG_LEVELS.Warning)
|
self.log(f"Submit this zip file as an issue to https://github.com/archlinux/archinstall/issues", level=LOG_LEVELS.Warning)
|
||||||
self.sync_log_to_install_medium()
|
self.sync_log_to_install_medium()
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@ storage = {
|
||||||
os.path.join(os.path.dirname(os.path.abspath(__file__)), 'profiles'),
|
os.path.join(os.path.dirname(os.path.abspath(__file__)), 'profiles'),
|
||||||
#os.path.abspath(f'{os.path.dirname(__file__)}/../examples')
|
#os.path.abspath(f'{os.path.dirname(__file__)}/../examples')
|
||||||
],
|
],
|
||||||
'UPSTREAM_URL' : 'https://raw.githubusercontent.com/Torxed/archinstall/master/profiles',
|
'UPSTREAM_URL' : 'https://raw.githubusercontent.com/archlinux/archinstall/master/profiles',
|
||||||
'PROFILE_DB' : None, # Used in cases when listing profiles is desired, not mandatory for direct profile grabing.
|
'PROFILE_DB' : None, # Used in cases when listing profiles is desired, not mandatory for direct profile grabing.
|
||||||
'LOG_PATH' : '/var/log/archinstall',
|
'LOG_PATH' : '/var/log/archinstall',
|
||||||
'LOG_FILE' : 'install.log',
|
'LOG_FILE' : 'install.log',
|
||||||
|
|
|
||||||
|
|
@ -11,7 +11,7 @@ It's compiled using `nuitka <https://nuitka.net/>`_ with the flag `--standalone`
|
||||||
Executing the binary
|
Executing the binary
|
||||||
--------------------
|
--------------------
|
||||||
|
|
||||||
As an example we'll use the `guided <https://github.com/Torxed/archinstall/blob/master/examples/guided.py>`_ installer.
|
As an example we'll use the `guided <https://github.com/archlinux/archinstall/blob/master/examples/guided.py>`_ installer.
|
||||||
To run the `guided` installed, all you have to do *(after installing or compiling the binary)*, is run:
|
To run the `guided` installed, all you have to do *(after installing or compiling the binary)*, is run:
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
Discord
|
Discord
|
||||||
=======
|
=======
|
||||||
|
|
||||||
There's a discord channel which is frequent by some `contributors <https://github.com/Torxed/archinstall/graphs/contributors>`_.
|
There's a discord channel which is frequent by some `contributors <https://github.com/archlinux/archinstall/graphs/contributors>`_.
|
||||||
|
|
||||||
To join the server, head over to `https://discord.gg/cqXU88y <https://discord.gg/cqXU88y>`_'s server and join in.
|
To join the server, head over to `https://discord.gg/cqXU88y <https://discord.gg/cqXU88y>`_'s server and join in.
|
||||||
There's not many rules other than common sense and treat others with respect.
|
There's not many rules other than common sense and treat others with respect.
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
Issue tracker & bugs
|
Issue tracker & bugs
|
||||||
====================
|
====================
|
||||||
|
|
||||||
Issues and bugs should be reported over at `https://github.com/Torxed/archinstall/issues <https://github.com/Torxed/archinstall/issues>`_.
|
Issues and bugs should be reported over at `https://github.com/archlinux/archinstall/issues <https://github.com/Torxed/archinstall/issues>`_.
|
||||||
|
|
||||||
General questions, enhancements and security issues can be reported over there too.
|
General questions, enhancements and security issues can be reported over there too.
|
||||||
For quick issues or if you need help, head over the to the Discord server which has a help channel.
|
For quick issues or if you need help, head over the to the Discord server which has a help channel.
|
||||||
|
|
|
||||||
|
|
@ -21,7 +21,7 @@ Archinstall is on the `official repositories <https://wiki.archlinux.org/index.p
|
||||||
Using PKGBUILD
|
Using PKGBUILD
|
||||||
--------------
|
--------------
|
||||||
|
|
||||||
The `source <https://github.com/Torxed/archinstall>`_ contains a binary `PKGBUILD <https://github.com/Torxed/archinstall/tree/master/PKGBUILD/archinstall>`_ which can be either copied straight off the website. Or cloned using `git clone https://github.com/Torxed/archinstall`.
|
The `source <https://github.com/archlinux/archinstall>`_ contains a binary `PKGBUILD <https://github.com/Torxed/archinstall/tree/master/PKGBUILD/archinstall>`_ which can be either copied straight off the website. Or cloned using `git clone https://github.com/Torxed/archinstall`.
|
||||||
|
|
||||||
Once you've obtained the `PKGBUILD`, building it is pretty straight forward.
|
Once you've obtained the `PKGBUILD`, building it is pretty straight forward.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -54,7 +54,7 @@ Or you can clone it, we'll clone it here but both methods work the same.
|
||||||
|
|
||||||
.. code-block:: console
|
.. code-block:: console
|
||||||
|
|
||||||
git clone https://github.com/Torxed/archinstall
|
git clone https://github.com/archlinux/archinstall
|
||||||
|
|
||||||
Either you can move the folder into your project and simply do
|
Either you can move the folder into your project and simply do
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,6 +1,6 @@
|
||||||
# Pull Request Template
|
# Pull Request Template
|
||||||
|
|
||||||
Make sure you've checked out the [contribution guideline](https://github.com/Torxed/archinstall/blob/master/CONTRIBUTING.md).<br>
|
Make sure you've checked out the [contribution guideline](https://github.com/archlinux/archinstall/blob/master/CONTRIBUTING.md).<br>
|
||||||
Most of the guidelines are not enforced, but is heavily encouraged.
|
Most of the guidelines are not enforced, but is heavily encouraged.
|
||||||
|
|
||||||
## Description
|
## Description
|
||||||
|
|
|
||||||
|
|
@ -112,7 +112,7 @@ def ask_user_questions():
|
||||||
try:
|
try:
|
||||||
partition.format(new_filesystem, path='/dev/null', log_formating=False, allow_formatting=True)
|
partition.format(new_filesystem, path='/dev/null', log_formating=False, allow_formatting=True)
|
||||||
except archinstall.UnknownFilesystemFormat:
|
except archinstall.UnknownFilesystemFormat:
|
||||||
archinstall.log(f"Selected filesystem is not supported yet. If you want archinstall to support '{new_filesystem}', please create a issue-ticket suggesting it on github at https://github.com/Torxed/archinstall/issues.")
|
archinstall.log(f"Selected filesystem is not supported yet. If you want archinstall to support '{new_filesystem}', please create a issue-ticket suggesting it on github at https://github.com/archlinux/archinstall/issues.")
|
||||||
archinstall.log(f"Until then, please enter another supported filesystem.")
|
archinstall.log(f"Until then, please enter another supported filesystem.")
|
||||||
continue
|
continue
|
||||||
except archinstall.SysCallError:
|
except archinstall.SysCallError:
|
||||||
|
|
|
||||||
2
setup.py
2
setup.py
|
|
@ -14,7 +14,7 @@ setuptools.setup(
|
||||||
description="Arch Linux installer - guided, templates etc.",
|
description="Arch Linux installer - guided, templates etc.",
|
||||||
long_description=long_description,
|
long_description=long_description,
|
||||||
long_description_content_type="text/markdown",
|
long_description_content_type="text/markdown",
|
||||||
url="https://github.com/Torxed/archinstall",
|
url="https://github.com/archlinux/archinstall",
|
||||||
packages=setuptools.find_packages(),
|
packages=setuptools.find_packages(),
|
||||||
classifiers=[
|
classifiers=[
|
||||||
"Programming Language :: Python :: 3.8",
|
"Programming Language :: Python :: 3.8",
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue