Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
752 commits
Select commit Hold shift + click to select a range
9f04a8c
Openrc fixes
Chrysostomus Mar 9, 2017
ce350a0
Fix setting bash as default shell for user
Chrysostomus Mar 9, 2017
fe89eda
fix dm openrc for unconfigured desktops
Mar 9, 2017
e520278
translatable Cancel label
Mar 10, 2017
7f5e58e
Merge pull request #97 from oberon2007/displaymanager-openrc
Chrysostomus Mar 10, 2017
25d7bb6
exit-label translatable
Mar 10, 2017
7ae12b4
add error check driver install and remove suprefluous
Mar 10, 2017
5ef75e7
check_base before install_drivers; close https://github.com/Chrysosto…
Mar 10, 2017
48ab6b4
move check_mount/base to functions rather then menus
Mar 10, 2017
b5177dc
remove confusing stable label
Mar 10, 2017
bf4b364
resolve conflict
Mar 10, 2017
6294426
source english text strings as a backup
Mar 10, 2017
ab4d472
install_drivers error_check and clear screen
Mar 10, 2017
b3d4ff9
fix install_drivers menu title
Mar 10, 2017
60f19aa
warn before removing .base_installed
Mar 10, 2017
511ecd9
Revert "move check_mount/base to functions rather then menus"
Mar 10, 2017
33d5c64
check_base before installing desktop
Mar 10, 2017
5f5dad2
adjust check_base for submenus; https://github.com/Chrysostomus/manja…
Mar 10, 2017
01e4176
driver menu highlighting; fix https://github.com/Chrysostomus/manjaro…
Mar 10, 2017
29f8035
correction log branch
Mar 10, 2017
3ae7778
filter_packages() missing error check
Mar 11, 2017
e5a9d81
common var for filter_packages(); attempted fix for https://github.co…
Mar 11, 2017
4e31e10
move package_list vor to the right places
Mar 11, 2017
a29d6da
start base install with empty pkg list
Mar 11, 2017
c3694e3
unify logging
Mar 11, 2017
982d819
rm some newlines in logging
Mar 11, 2017
9032cde
bump version
Mar 11, 2017
8cb02c1
rm grub from packages list; close https://github.com/Chrysostomus/man…
Mar 11, 2017
a4e7421
new graphics driver submenu; https://github.com/Chrysostomus/manjaro-…
Mar 11, 2017
ae6311a
final check translatable (video driver check added)
Mar 11, 2017
b9a6c90
write only vertical lists to /mnt/.base before filter
Mar 11, 2017
3dfedf8
install_extra() list not installed pkgs only
Mar 11, 2017
d381024
add German
Mar 11, 2017
5ae8513
german.trans fix syntax, translate new strings and some more
Mar 12, 2017
2a14f6e
Fix base installation, install network drivers at the end of base ins…
Chrysostomus Mar 12, 2017
71cb66f
Complete previous
Chrysostomus Mar 12, 2017
dc50057
Trigger graphics drivers installation at the end of profile installat…
Chrysostomus Mar 12, 2017
4013f65
German
Mar 12, 2017
1bcea64
corrections german
Mar 12, 2017
c463802
fix common pkgs dialog
Mar 12, 2017
25dff0f
remove useless 'optional' comment
Mar 12, 2017
7cfea4c
add missing install_graphics_menu; https://github.com/Chrysostomus/ma…
Mar 12, 2017
78edc32
add drivers menu to advanced; https://github.com/Chrysostomus/manjaro…
Mar 12, 2017
eb615da
remove unused code; upd menu overview
Mar 12, 2017
65aa30c
adjust custom pkgs text
Mar 12, 2017
2b81b89
fix logic language choice
Mar 12, 2017
49792c7
Adjust graphics installation
Chrysostomus Mar 13, 2017
cf4a1b4
hungarian escape brackets
Mar 13, 2017
29837c4
adjust fonts for languages
Mar 13, 2017
201d5f1
Merge branch 'master' of https://github.com/Chrysostomus/manjaro-arch…
Mar 13, 2017
4422604
upd language files
Mar 13, 2017
6abed8c
hungarian, fix open quotes
Mar 13, 2017
fdd5627
mirror menu, order as in description and fix cancel return level
Mar 13, 2017
eccf4d0
correct parent menu highlight when leaving config mirror
Mar 13, 2017
933ce84
corrections german
Mar 13, 2017
42b2301
german
Mar 13, 2017
07d2bb7
fix sed Branch
Mar 13, 2017
237eac0
ini file
papajoker Mar 13, 2017
d03af7c
Merge pull request #108 from papajoker/ini
Chrysostomus Mar 13, 2017
c47038c
users in ini
papajoker Mar 13, 2017
f8480ae
Update util-desktop.sh
Chrysostomus Mar 13, 2017
02f45d1
include set_keymap in initial language selection
Mar 13, 2017
f747a99
correction and upd menu map
Mar 13, 2017
50086f8
run set_keymap only once, like set_language
Mar 13, 2017
79287df
upd Makefile with ini_val.sh
Mar 13, 2017
105bdbb
upd Makefile with ini_val.sh
Mar 13, 2017
f7c9364
correction varname
Mar 13, 2017
26ee74f
unify newlines dialogboxes
Mar 13, 2017
194f390
merge upstream
Mar 13, 2017
1817edc
remove obsolete comment
Mar 13, 2017
17631db
upd/unify language files.
Mar 13, 2017
9f444f1
fix output
papajoker Mar 13, 2017
1de3968
finally really fix set target Branch ;)
Mar 13, 2017
e16cab1
Merge branch 'master' of https://github.com/Chrysostomus/manjaro-arch…
Mar 13, 2017
eef437e
commit was not finished ...
Mar 13, 2017
e684f30
typo
Mar 13, 2017
d9d51bf
correction ini branch
Mar 13, 2017
ede83ba
fix branch
papajoker Mar 13, 2017
b65d813
german
Mar 13, 2017
0d726d9
fix newlines checklist
Mar 13, 2017
5150b20
use in for handling branch; https://github.com/Chrysostomus/manjaro-a…
Mar 13, 2017
d61a7f5
fix BRANCH to global
papajoker Mar 14, 2017
85cc4ea
Merge remote-tracking branch 'upstream/master'
papajoker Mar 14, 2017
84b4472
offer yaourt with base-devel group; https://forum.manjaro.org/t/manja…
Mar 14, 2017
05dddc8
join multiple sed
Mar 14, 2017
ba1271f
dialog formatting
Mar 14, 2017
41ec7af
Merge branch 'master' of https://github.com/Chrysostomus/manjaro-arch…
Mar 14, 2017
9f5df95
fix a dialog header
Mar 14, 2017
0912cff
text files
Mar 14, 2017
445281f
Merge branch 'master' into ini
papajoker Mar 14, 2017
571b994
rm non file
Mar 14, 2017
fb5ab03
Merge branch 'ini' of https://github.com/Chrysostomus/manjaro-archite…
Mar 14, 2017
d13baad
Create polish.trans
edskeye Mar 14, 2017
ddd06bc
attempt fix install_base() logic; https://github.com/Chrysostomus/man…
Mar 14, 2017
96b91e4
fix installed kernel logic; https://github.com/Chrysostomus/manjaro-a…
Mar 14, 2017
21544d0
corrections install_base
Mar 14, 2017
07a3b9b
fix cancel uefi mount
Mar 14, 2017
f4c0901
Merge pull request #114 from Chrysostomus/ini
Mar 14, 2017
ac02029
Merge branch 'master' into keymap
Mar 14, 2017
cd44616
Merge pull request #110 from oberon2007/keymap
Mar 14, 2017
edfbe35
Merge pull request #116 from Chrysostomus/master
Mar 14, 2017
e5dc586
list installed kernels once
Mar 14, 2017
c46e7f3
Merge branch 'ini' of https://github.com/Chrysostomus/manjaro-archite…
Mar 14, 2017
86493f9
list installed kernels once
Mar 14, 2017
f10b7e8
rm unused KERNEL var
Mar 14, 2017
a7d0fb2
mount partitions filters and fix return
papajoker Mar 14, 2017
15d34d1
message while filtering pkgs
Mar 14, 2017
a8af133
handle errors when installing pkgs; close
Mar 14, 2017
f5f1161
Merge pull request #118 from papajoker/parts
Mar 14, 2017
f31f1bf
translation of failure :/
Mar 14, 2017
edbcc05
nw driver selection needs to be checklist
Mar 14, 2017
506a878
rm duplicate logging
Mar 14, 2017
79faf1e
adjust menu text graphics drivers
Mar 14, 2017
b369839
fix German bootloader explanation
Mar 14, 2017
85f2f7c
last strings before release
papajoker Mar 14, 2017
488bccc
one header formatting I missed ;)
Mar 14, 2017
f353838
bigger keymap selection window
Mar 14, 2017
15418d0
loop until kernel selected
Mar 14, 2017
bd25949
move clear after filter message
Mar 14, 2017
712a144
empty line after kernel selection
Mar 14, 2017
fb43a9e
use --msgbox for error
Mar 14, 2017
8f13fbd
move error msgs to functions
Mar 14, 2017
24562c5
return to menu after error
Mar 14, 2017
b49cea9
final_check() use mhwd check for video driver
Mar 14, 2017
7e9338b
Merge branch 'ini' into master
Mar 15, 2017
a5aa3fb
Merge pull request #121 from Chrysostomus/master
Mar 15, 2017
783f2c9
submenu highlight tweaking
Mar 15, 2017
1a21ebb
Merge branch 'master' of https://github.com/Chrysostomus/manjaro-arch…
Mar 15, 2017
a6f92f0
Revert "final_check() use mhwd check for video driver"
Mar 15, 2017
9284b13
free/nonfree options for network drivers
Mar 15, 2017
0cd3a39
Revert "free/nonfree options for network drivers"
Mar 15, 2017
9a30cea
now the right one ;)
Mar 15, 2017
7a2a100
Merge pull request #122 from Chrysostomus/master
Mar 15, 2017
8349204
prevent error after install bootloader
Mar 15, 2017
763ccc5
add dynamic edit_configs menu
Mar 15, 2017
a6d9376
eliminate literal *; offer to update grub; grub_mkconfig()
Mar 15, 2017
69e2231
pass params by console or file ini (#120)
papajoker Mar 16, 2017
72d44cd
one recursive leftover! ;)
Mar 16, 2017
7db4b6a
formatting confirmation dialogs
Mar 16, 2017
3826f35
Russian translation (#125)
kainonergon Mar 16, 2017
7a7ce87
Merge pull request #124 from Chrysostomus/edit_config
Mar 16, 2017
f565608
[Makefile] bump version to 0.8.1
Mar 17, 2017
4d5d9d6
first rescue
papajoker Mar 17, 2017
81bde53
add files
papajoker Mar 17, 2017
b04a3d8
texts rescue
papajoker Mar 17, 2017
c139658
body format text
papajoker Mar 17, 2017
b91da22
mount menu strcture
papajoker Mar 17, 2017
96dde4d
mount disk
papajoker Mar 17, 2017
c90e917
Merge branch 'rescue' into master
papajoker Mar 17, 2017
8a89d30
Revert "Merge branch 'rescue' into master"
papajoker Mar 17, 2017
4033546
fix rank_mirrors
Mar 19, 2017
afc2d35
automatic keymap with option to change
Mar 19, 2017
788796e
select keymap only once
Mar 19, 2017
5b090c4
language strings
Mar 20, 2017
78e07ff
use ini to test for keymap already defined
Mar 20, 2017
013d215
use ini to test if language already set
Mar 20, 2017
43c08b8
use grep saved ini file instead
Mar 20, 2017
7da4691
v0.8.2
Mar 21, 2017
12205d1
re-organize lang/keymap/font settings
Mar 21, 2017
3fa4a5c
update dialogs
Mar 21, 2017
ef38de0
little corrections
Mar 21, 2017
4af00c8
correction German and dialog formatting
Mar 21, 2017
1172ed5
Merge pull request #129 from Chrysostomus/keymap
Mar 21, 2017
df8a4f3
use ini for target config keymap/consolefont
Mar 21, 2017
e50a7ba
adjust text bootloader selection
Mar 23, 2017
0bbde22
Update english.trans
Chrysostomus Mar 24, 2017
0d14915
update language files
Mar 24, 2017
3b35eed
reintroduce keymap settings in prep_menu
Mar 24, 2017
4b944fd
correction language files
Mar 24, 2017
1f4e0c1
attempt fix https://github.com/Chrysostomus/manjaro-architect/issues/128
Mar 25, 2017
92e0d7c
corrections
Mar 25, 2017
ac4e9d3
start with empty pkgs desktop list
Mar 25, 2017
fd00298
fix set keymap
Mar 25, 2017
7219d9b
fix set keymap
Mar 25, 2017
044399e
correction
Mar 25, 2017
71ee4b8
Merge pull request #133 from Chrysostomus/pkgs_lists
Mar 25, 2017
a412981
add explanation pacman-mirrors; close https://github.com/Chrysostomus…
Mar 25, 2017
1c608df
Merge branch 'master' of https://github.com/Chrysostomus/manjaro-arch…
Mar 25, 2017
d547e97
import only once
papajoker Mar 25, 2017
b25cd74
bump to 0.8.3
Mar 26, 2017
34dcade
deal with already installed desktop
Mar 26, 2017
4c5feb4
fix cancel action
Mar 26, 2017
6dd28bb
adjust base install text
Mar 27, 2017
c6762ec
unconfigured: sort and add JWM
Mar 27, 2017
63115c7
clearer menu text driver installation
Mar 27, 2017
35cefe9
fix german translation file
Mar 27, 2017
45e936a
bump to 0.8.4
Mar 27, 2017
7dddd80
drivers,keymap,mirrors
papajoker Mar 27, 2017
0814331
move advanced_menu() to util-advanced.sh
Mar 28, 2017
17f43a3
bump to 0.8.5
Mar 28, 2017
a638feb
use nw_check.py
Mar 28, 2017
ddc10d5
work on luks/lvm menu functions
Mar 28, 2017
308fe96
lvm_create()
Mar 28, 2017
e8a2f37
work on lvm section
Mar 28, 2017
af5bda6
missing 'then'
Mar 28, 2017
fd34260
lvm
Mar 28, 2017
b3db666
some more dialog formatting
Mar 28, 2017
caf5848
typo German
Mar 28, 2017
f84556e
Merge pull request #139 from Chrysostomus/luks_lvm
Mar 28, 2017
86b38b7
silence useless error output
Mar 28, 2017
7d94cc6
Merge pull request #140 from Chrysostomus/luks_lvm
Mar 28, 2017
e0e276f
fix duplicate driver listing and adjust menu
Mar 28, 2017
ea9eecc
add lvm/luks hooks as needed
Mar 29, 2017
b5292a2
fix console blackout
Mar 29, 2017
80ea952
fix typo
papajoker Mar 29, 2017
971820e
v0.8.6
Mar 29, 2017
79ca4d9
Merge branch 'master' of https://github.com/Chrysostomus/manjaro-arch…
Mar 29, 2017
54ad532
start review luks section
Mar 30, 2017
01cb077
luks/lvm functions more logical order
Mar 30, 2017
9bcb0ad
luks_password non-recursive version
Mar 30, 2017
802a8af
loop luks_menu
Mar 30, 2017
bfeb4fc
resolve conflict
Mar 30, 2017
10211c7
luks_open() enter password only once
Mar 30, 2017
9e52b4f
setterm only when on tty
Mar 30, 2017
e6aabaf
fix inputbox
Mar 30, 2017
0e16ff1
fix formatting
Mar 30, 2017
4b0dab5
Merge pull request #142 from Chrysostomus/luks_lvm
Mar 30, 2017
34d1d5b
Update util-desktop.sh
Chrysostomus Apr 3, 2017
ee0b1fe
Update polish.trans
edskeye Apr 3, 2017
f32ee6d
little cosmetics
Apr 3, 2017
0daca25
Merge branch 'master' of https://github.com/Chrysostomus/manjaro-arch…
Apr 3, 2017
088b8aa
corrections German
Apr 6, 2017
e04f449
Revert "use nw_check.py"
Apr 6, 2017
0b672c2
use curl for connectivity test
Apr 6, 2017
ba08d32
bump to 0.8.7
Apr 6, 2017
3a678a2
correction German
Apr 6, 2017
4bda267
upd lvm translations
Apr 8, 2017
00805bf
https://forum.manjaro.org/t/installation-with-manjaro-architect-iso/2…
Apr 10, 2017
9fad33d
text correction
Apr 10, 2017
d023217
Update polish.trans
edskeye Apr 10, 2017
4bf09bd
Finished Polish translation
edskeye Apr 11, 2017
7e28479
Merge pull request #148 from edskeye/master
Apr 11, 2017
2c479e9
Merge branch 'master' of https://github.com/Chrysostomus/manjaro-arch…
Apr 11, 2017
406a1b8
integrate Polish
Apr 11, 2017
e84f492
update Makefile
Apr 11, 2017
0c8ab6d
formatting
Apr 11, 2017
04923d5
adjust font for Polish
Apr 11, 2017
9b3ab39
Polish, escape quotes
Apr 11, 2017
22f0e76
little fixes Polish
Apr 11, 2017
f5abc1d
v0.8.8
Apr 11, 2017
cb9a8d6
Update polish.trans
edskeye Apr 12, 2017
243b217
Update polish.trans
edskeye Apr 12, 2017
17560e7
Merge pull request #149 from edskeye/master
Apr 12, 2017
7b9857c
text correction
Apr 12, 2017
b50f84e
Merge pull request #1 from Chrysostomus/master
edskeye Apr 12, 2017
17a9dfa
Updated Polish translation
edskeye Apr 12, 2017
dd7b857
Merge pull request #150 from edskeye/master
Apr 12, 2017
57d7b3f
Add btrfs subvolume support
Chrysostomus Apr 17, 2017
2636b58
sync db if change branch
papajoker Apr 20, 2017
947a581
cat pacman log with error 255
papajoker Apr 20, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
107 changes: 107 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
Version=0.8.8

PREFIX = /usr
LIBDIR = /lib/manjaro-architect
DATADIR = /share/manjaro-architect

BIN = \
bin/btrfs-subvol-functions \
bin/check-translate.in \
bin/ma-launcher \
bin/manjaro-architect

LIBS = \
lib/ini_val.sh \
lib/util.sh \
lib/util-advanced.sh \
lib/util-base.sh \
lib/util-config.sh \
lib/util-desktop.sh \
lib/util-disk.sh \
lib/util-menu.sh

LISTS = \
data/package-lists/base-openrc-manjaro \
data/package-lists/base-systemd-manjaro \
data/package-lists/input-drivers

LANG = \
data/translations/danish.trans \
data/translations/dutch.trans \
data/translations/english.trans \
data/translations/french.trans \
data/translations/german.trans \
data/translations/hungarian.trans \
data/translations/italian.trans \
data/translations/polish.trans \
data/translations/portuguese.trans \
data/translations/portuguese_brasil.trans \
data/translations/russian.trans \
data/translations/spanish.trans

ICONS = \
data/manjaro-architect.png

LAUNCHER = \
data/manjaro-architect.desktop

LIVE = \
data/ma-launcher.desktop

all: $(BIN)

edit = \
sed -e "s|@datadir[@]|$(DESTDIR)$(PREFIX)$(DATADIR)|g" \
-e "s|@libdir[@]|$(DESTDIR)$(PREFIX)$(LIBDIR)|g" \
-e "s|@version@|${Version}|"

%: %.in Makefile
@echo "GEN $@"
@$(RM) "$@"
@m4 -P $@.in | $(edit) >$@
@chmod a-w "$@"
@chmod +x "$@"

clean:
rm -f $(BIN)

install:
install -dm0755 $(DESTDIR)$(PREFIX)/bin
install -m0755 ${BIN} $(DESTDIR)$(PREFIX)/bin

install -dm0755 $(DESTDIR)$(PREFIX)$(LIBDIR)
install -m0644 ${LIBS} $(DESTDIR)$(PREFIX)$(LIBDIR)

install -dm0755 $(DESTDIR)$(PREFIX)$(DATADIR)/package-lists
install -m0644 ${LISTS} $(DESTDIR)$(PREFIX)$(DATADIR)/package-lists

install -dm0755 $(DESTDIR)$(PREFIX)$(DATADIR)/translations
install -m0644 ${LANG} $(DESTDIR)$(PREFIX)$(DATADIR)/translations

install -dm0755 $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps
install -m0644 ${ICONS} $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps

install -dm0755 $(DESTDIR)$(PREFIX)/share/applications
install -m0644 ${LAUNCHER} $(DESTDIR)$(PREFIX)/share/applications

install -dm0755 $(DESTDIR)/etc/skel/.config/autostart
install -m0644 ${LIVE} $(DESTDIR)/etc/skel/.config/autostart

uninstall:
for f in ${BIN}; do rm -f $(DESTDIR)$(PREFIX)/bin/$$f; done
for f in ${LIBS}; do rm -f $(DESTDIR)$(PREFIX)$(LIBDIR)/$$f; done
for f in ${LISTS}; do rm -f $(DESTDIR)$(PREFIX)$(DATADIR)/package-lists/$$f; done
for f in ${LANG}; do rm -f $(DESTDIR)$(PREFIX)$(DATADIR)/translations/$$f; done
for f in ${ICONS}; do rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/48x48/apps/$$f; done
for f in ${LAUNCHER}; do rm -f $(DESTDIR)$(PREFIX)/share/applications/$$f; done
for f in ${LIVE}; do rm -f $(DESTDIR)/etc/skel/.config/autostart/$$f; done

install: install

uninstall: uninstall

dist:
git archive --format=tar --prefix=manjaro-architect-$(Version)/ $(Version) | gzip -9 > manjaro-architect-$(Version).tar.gz
gpg --detach-sign --use-agent manjaro-architect-$(Version).tar.gz

.PHONY: all clean install uninstall dist
46 changes: 46 additions & 0 deletions PKGBUILD
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# Maintainer: Chrysostomus @forum.manjaro.org
# Maintainer: Bernhard Landauer <oberon@manjaro.org>

pkgbase=manjaro-architect
pkgname=('manjaro-architect' 'manjaro-architect-launcher')
pkgver=0.7.4.r78.g86f8c83
pkgrel=1
pkgdesc="Manjaro CLI net-installer, forked from the Archlinux Architect"
arch=(any)
url="https://github.com/Chrysostomus/$pkgbase"
license=(GPL2)
depends=('bash'
'dialog')
makedepends=('git')
optdepends=('maia-console'
'terminus-font')
source=("git+$url.git#branch=master")
md5sums=('SKIP')

pkgver() {
cd $pkgbase
git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
}

build() {
cd $pkgbase
make PREFIX=/usr
}

package_manjaro-architect() {
depends+=('f2fs-tools'
'gptfdisk'
'manjaro-architect-launcher'
'manjaro-tools-base'
'mhwd'
'nilfs-utils'
'pacman-mirrorlist'
'parted')
cd $pkgbase
make PREFIX=/usr DESTDIR=${pkgdir} install
}

package_manjaro-architect-launcher() {
cd $pkgbase
install -Dm755 bin/setup $pkgdir/usr/bin/setup
}
8 changes: 6 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,2 +1,6 @@
# aif
Development version of the Architect Installation Framework
# manjaro-architect
Development version of a CLI net-installer for Manjarolinux, forked from Carl Duff's Architect

This unofficial installer provides netinstallation for different manjaro editions. It sources the iso-profiles git repo, so it should be always up to date.

Currently under heavy construction.
Loading