From e5701fb4c83ea4a8d17572b1cf45d5f273db8dc5 Mon Sep 17 00:00:00 2001 From: Fabian Bornschein Date: Sun, 11 Oct 2020 01:10:28 +0200 Subject: [PATCH 1/4] create a standalone and DE usable, flexible pkgbuild --- PKGBUILD/PKGBUILD | 81 ++++++---- PKGBUILD/archinstall_gui.svg | 146 ++++++++++++++++++ .../org.archlinux.archinstall_gui.desktop | 10 ++ 3 files changed, 208 insertions(+), 29 deletions(-) create mode 100644 PKGBUILD/archinstall_gui.svg create mode 100644 PKGBUILD/org.archlinux.archinstall_gui.desktop diff --git a/PKGBUILD/PKGBUILD b/PKGBUILD/PKGBUILD index 858d841..5a3c09e 100644 --- a/PKGBUILD/PKGBUILD +++ b/PKGBUILD/PKGBUILD @@ -1,42 +1,65 @@ # Maintainer: Anton Hvornum anton@hvornum.se # Contributor: Anton Hvornum anton@hvornum.se -pkgname="archinstall-gui" -pkgver="0.1rc20" -pkgdesc="A graphical installer for Arch Linux. Useful for Live CD's etc." +# Contributor: Fabian Bornschein plusfabi-cat-gmail-dog-com +pkgbase=archinstall_gui +pkgname=('archinstall-gui-server' 'archinstall-gui-standalone' 'archinstall-gui-desktop') +pkgver=v0.1rc20 pkgrel=1 url="https://github.com/Torxed/archinstall_gui" -archinstall_url="https://github.com/Torxed/archinstall.git" license=('GPLv3') -provides=("${pkgname}") -md5sums=('SKIP') arch=('x86_64') -source=("${pkgname}-v${pkgver}-x86_64.tar.gz::https://github.com/Torxed/archinstall_gui/archive/v$pkgver.tar.gz") -#depends=('python>=3.8' 'chromium' 'xorg-server' 'xorg-xinit' 'archinstall') -depends=('python>=3.8' 'chromium' 'xorg-server' 'xorg-xinit') -optdepends=('python-systemd: Adds more controlled logging functionality') +makedepends=(git) +_archinstall_commit=2c24903932342a32cdfa8c684547859116fb254e # tags/v2.0.5 +_archinstall_gui_commit=2248aeb3099c296baf873c5e45aa181f09346189 # tags/v0.1rc20 +source=(git+https://github.com/Torxed/archinstall.git#commit=${_archinstall_commit} + git+https://github.com/Torxed/archinstall_gui.git#commit=${_archinstall_gui_commit} + archinstall-gui + archinstall_gui.service + archinstall_gui.svg + org.archlinux.archinstall_gui.desktop) +sha256sums=('SKIP' + 'SKIP' + '78ea37402accdb4584b0d48618add5f074bf353a29f85ad0cae4dd3a4b5be323' + 'eb0acdf595173f97b7c1ef6ff92cd62c63fd4e0e7d870087c65b2f3f1bb6438c' + '23f5bc2578f3baf3cb284fed4c68370c5eebba46e3f29c1ce9151076f2ae8daf' + '3943d9349c71456bf6bf72c90ba39a432f78df6dbe99969fa937bd14deee498f') -package() { - # Will add this back when I've renamed the project upstream: - # cd "${pkgname}-${pkgver}" - cd "archinstall_gui-${pkgver}" +pkgver() { + cd "${pkgbase}" + git describe --tags | sed 's/-/+/g' +} + +package_archinstall-gui-server() { + pkgdesc="Server for a graphical installer for Arch Linux." + depends=('python>=3.8' 'systemd') + optdepends=('python-systemd: Adds more controlled logging functionality') mkdir -p "${pkgdir}/srv/archinstall_gui" mkdir -p "${pkgdir}/usr/bin" - mkdir -p "${pkgdir}/etc/systemd/system" - - # PATCH: While we're working on a better shipping strat for archinstall, - # we'll have to git clone the repo manually. archinstall PKGBUILD currently builds and installs - # the binary version of archinstall for a more "standalone" approach, but we're - # introducing optdepends for python>=3.8 which will build and install the library. - # After that, we can completely remove the submodule-requirement for archinstall in archinstall_gui. - # But until then, we'll have to manually clone it in in the wait for a dual-build release of archinstall PKGBUILD. - rm -rf archinstall_gui/dependencies/archinstall - git clone "${archinstall_url}" archinstall_gui/dependencies/archinstall - mv archinstall_gui/* "${pkgdir}/srv/archinstall_gui/" - mv PKGBUILD/archinstall-gui "${pkgdir}/usr/bin/archinstall-gui" - mv PKGBUILD/archinstall_gui.service "${pkgdir}/etc/systemd/system/archinstall_gui.service" + mv "${srcdir}/archinstall_gui/archinstall_gui"/* "${pkgdir}/srv/archinstall_gui/" + mv "${srcdir}/archinstall/archinstall" "${pkgdir}/srv/archinstall_gui/dependencies/" chmod +x "${pkgdir}/srv/archinstall_gui/webgui.py" - chmod +x "${pkgdir}/usr/bin/archinstall-gui" -} \ No newline at end of file + + install -Dm 644 "${srcdir}/archinstall_gui.service" \ + "${pkgdir}/usr/lib/systemd/system/archinstall_gui.service" +} + +package_archinstall-gui-standalone() { + pkgdesc="A graphical installer for Arch Linux." + depends=('archinstall-gui-server' 'chromium' 'xorg-server' 'xorg-xinit') + + install -Dm 755 "${srcdir}/archinstall-gui" \ + "${pkgdir}/usr/bin/archinstall-gui" +} + +package_archinstall-gui-desktop() { + pkgdesc="A graphical installer for Arch Linux." + depends=('archinstall-gui-server' 'xdg-utils') + + install -Dm 644 "${srcdir}/archinstall_gui.svg" \ + "${pkgdir}/usr/share/pixmaps/archinstall_gui.svg" + install -Dm 644 "${srcdir}/org.archlinux.archinstall_gui.desktop" \ + "${pkgdir}/usr/share/applications/org.archlinux.archinstall_gui.desktop" +} diff --git a/PKGBUILD/archinstall_gui.svg b/PKGBUILD/archinstall_gui.svg new file mode 100644 index 0000000..046ddaa --- /dev/null +++ b/PKGBUILD/archinstall_gui.svg @@ -0,0 +1,146 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/PKGBUILD/org.archlinux.archinstall_gui.desktop b/PKGBUILD/org.archlinux.archinstall_gui.desktop new file mode 100644 index 0000000..51ab30e --- /dev/null +++ b/PKGBUILD/org.archlinux.archinstall_gui.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Version=1.0.0 +Type=Application +Terminal=false +Exec=/usr/bin/xdg-open http://127.0.0.1 +TryExec=/usr/bin/xdg-open +Name=Install Arch Linux +Name[de]=Arch Linux Installieren +Comment=Installation tool +Icon=archinstall_gui.svg From 21a9a0eefa20c48f32fea764049fe78dc701655a Mon Sep 17 00:00:00 2001 From: Fabian Bornschein Date: Fri, 16 Oct 2020 17:54:24 +0200 Subject: [PATCH 2/4] redo the icon --- PKGBUILD/archinstall_gui.svg | 300 +++++++++++++++++++++++++---------- 1 file changed, 214 insertions(+), 86 deletions(-) diff --git a/PKGBUILD/archinstall_gui.svg b/PKGBUILD/archinstall_gui.svg index 046ddaa..bdf05e6 100644 --- a/PKGBUILD/archinstall_gui.svg +++ b/PKGBUILD/archinstall_gui.svg @@ -5,13 +5,14 @@ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" + xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - sodipodi:docname="calamares-icon.svg" - viewBox="0 0 512 512" - height="512" - width="512" - inkscape:version="1.1-dev (e997ca1f1f, 2020-02-02)" + sodipodi:docname="archinstall_gui.svg" + viewBox="0 0 128 128" + height="128" + width="128" + inkscape:version="1.0.1 (3bc2e813f5, 2020-09-07)" version="1.1" id="svg3505"> image/svg+xml - + + id="defs3509"> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + pagecolor="#ffffff" + inkscape:document-rotation="0"> + id="g1512" + style="display:inline;enable-background:new" + transform="matrix(0.24615385,0,0,0.24615385,0.61508656,5.6920008)"> + id="path1350" + style="fill:#424048;fill-opacity:1;stroke-width:1" + d="m 20,40 c -2.241773,-10e-7 -4,1.798647 -4,4 v 62 c 0,2.24957 1.722387,4 4,4 h 104 c 2.34482,0 4,-1.72143 4,-4 V 44 c 0,-2.201353 -1.75823,-4 -4,-4 -2,10e-7 -102,10e-7 -104,0 z" + transform="matrix(4.0624999,0,0,4.0624999,-34.998788,-112.49875)" + sodipodi:nodetypes="ssssssscs" /> + id="path1464" + style="opacity:1;fill:url(#linearGradient1475);fill-opacity:1;stroke-width:0.246156" + d="m 52,125 c -1.999646,-2.5e-4 -4,1.73441 -4,4 v 1 h 0.148438 C 48.630057,128.24677 50.308839,126.99979 52,127 h 40 c 2.03215,-0.008 3.483617,1.21997 3.880859,3 H 96 v -1 c 0,-2.30882 -1.604106,-4.00897 -4,-4 z" + transform="matrix(4.0624999,0,0,4.0624999,-34.998788,-112.49875)" /> - - + d="m 176.24977,403.44018 c -8.12356,-10e-4 -16.24856,7.0446 -16.24856,16.24856 v 4.0625 h 195 v -4.0625 c 0,-9.3796 -6.51668,-16.28646 -16.25,-16.25 -4.0625,0 -158.4375,0 -162.5,0 -6.3e-4,2.6e-4 -7.6e-4,10e-4 -10e-4,10e-4 z" + style="opacity:1;fill:#c0bfbc;fill-opacity:1;stroke-width:1.00001" + id="path874-3" /> + y="58.126247" + x="38.126209" + height="247.8125" + width="438.75" + id="rect870-6" + style="opacity:1;fill:#1793d1;fill-opacity:1;stroke-width:0.858122" /> - - - - - + y="350.62625" + x="204.68871" + height="12.187493" + width="105.625" + id="rect872-7" + style="opacity:0.25;fill:#000000;fill-opacity:1" /> + style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.782324" + id="path1591-5" + d="m 257.48897,115.00125 c -5.7873,14.18621 -9.2779,23.46566 -15.72126,37.23017 3.95058,4.18683 8.79977,9.06262 16.6748,14.56936 -8.46644,-3.48323 -14.24162,-6.98031 -18.55747,-10.60923 -8.24628,17.20392 -21.16585,41.71015 -47.38382,88.80968 20.60643,-11.8942 36.58019,-19.22714 51.46695,-22.02518 -0.63925,-2.74887 -1.00268,-5.72229 -0.97798,-8.82475 l 0.0245,-0.66001 c 0.32699,-13.19954 7.19464,-23.34997 15.33009,-22.66078 8.13539,0.68918 14.45898,11.95463 14.13199,25.15421 -0.0613,2.4837 -0.34171,4.87304 -0.8313,7.08909 14.72514,2.87999 30.52808,10.19411 50.85572,21.92742 -4.0082,-7.378 -7.58589,-14.02873 -11.00245,-20.36291 -5.38161,-4.17034 -10.99491,-9.59802 -22.44497,-15.47386 7.87013,2.0446 13.50505,4.40354 17.89731,7.04026 -34.73695,-64.66214 -37.5499,-73.25441 -49.46199,-101.20347 z" /> + + + From d32e1ec48933115b81c334e9cfc2457b6fe67304 Mon Sep 17 00:00:00 2001 From: Fabian Bornschein Date: Fri, 16 Oct 2020 17:55:14 +0200 Subject: [PATCH 3/4] update pkgbuild --- PKGBUILD/PKGBUILD | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/PKGBUILD/PKGBUILD b/PKGBUILD/PKGBUILD index 5a3c09e..aafa32b 100644 --- a/PKGBUILD/PKGBUILD +++ b/PKGBUILD/PKGBUILD @@ -1,10 +1,10 @@ # Maintainer: Anton Hvornum anton@hvornum.se # Contributor: Anton Hvornum anton@hvornum.se # Contributor: Fabian Bornschein plusfabi-cat-gmail-dog-com -pkgbase=archinstall_gui +pkgbase=archinstall-gui pkgname=('archinstall-gui-server' 'archinstall-gui-standalone' 'archinstall-gui-desktop') pkgver=v0.1rc20 -pkgrel=1 +pkgrel=2 url="https://github.com/Torxed/archinstall_gui" license=('GPLv3') arch=('x86_64') @@ -21,11 +21,11 @@ sha256sums=('SKIP' 'SKIP' '78ea37402accdb4584b0d48618add5f074bf353a29f85ad0cae4dd3a4b5be323' 'eb0acdf595173f97b7c1ef6ff92cd62c63fd4e0e7d870087c65b2f3f1bb6438c' - '23f5bc2578f3baf3cb284fed4c68370c5eebba46e3f29c1ce9151076f2ae8daf' + '31d5f6a03ddcac20d81696ba717ceafe63caf592491970ceafa7d5717c1c2224' '3943d9349c71456bf6bf72c90ba39a432f78df6dbe99969fa937bd14deee498f') pkgver() { - cd "${pkgbase}" + cd "archinstall_gui" git describe --tags | sed 's/-/+/g' } From 3d3d39fc3043ca270d94073770bda6ae74ba9e39 Mon Sep 17 00:00:00 2001 From: Fabian Bornschein Date: Sat, 17 Oct 2020 11:22:40 +0200 Subject: [PATCH 4/4] cleanup; optimize the icon --- PKGBUILD/PKGBUILD | 2 +- PKGBUILD/archinstall_gui.svg | 320 ++++++----------------------------- 2 files changed, 52 insertions(+), 270 deletions(-) diff --git a/PKGBUILD/PKGBUILD b/PKGBUILD/PKGBUILD index aafa32b..93733d6 100644 --- a/PKGBUILD/PKGBUILD +++ b/PKGBUILD/PKGBUILD @@ -21,7 +21,7 @@ sha256sums=('SKIP' 'SKIP' '78ea37402accdb4584b0d48618add5f074bf353a29f85ad0cae4dd3a4b5be323' 'eb0acdf595173f97b7c1ef6ff92cd62c63fd4e0e7d870087c65b2f3f1bb6438c' - '31d5f6a03ddcac20d81696ba717ceafe63caf592491970ceafa7d5717c1c2224' + 'f521e95c9882e86ed078c87ef6f3ab9c7f1ef3b5ecb9c350746cd07c5cbc107d' '3943d9349c71456bf6bf72c90ba39a432f78df6dbe99969fa937bd14deee498f') pkgver() { diff --git a/PKGBUILD/archinstall_gui.svg b/PKGBUILD/archinstall_gui.svg index bdf05e6..bf2461a 100644 --- a/PKGBUILD/archinstall_gui.svg +++ b/PKGBUILD/archinstall_gui.svg @@ -1,274 +1,56 @@ - - - - - - image/svg+xml - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - + + + + + + + + + + + +