Archives/manjaro-architect
2
0
Fork 0
mirror of https://gitlab.manjaro.org/applications/manjaro-architect synced 2024-11-08 01:10:26 +00:00
Code Issues Projects Releases Wiki Activity

add option to use profiles-pkgs

Browse Source
This commit is contained in:
Bernhard Landauer 2017-02-11 20:19:31 +01:00
parent a1da280bdd
commit 5778c228a7
1 changed files with 55 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

79
manjaro-architect
View File

@ -85,7 +85,7 @@ XKBMAP="us" # X11 keyboard layout. Default is "us"
ZONE="" # For time ZONE="" # For time
SUBZONE="" # For time SUBZONE="" # For time
LOCALE="en_US.UTF-8" # System locale. Default is "en_US.UTF-8" LOCALE="en_US.UTF-8" # System locale. Default is "en_US.UTF-8"
PROFILES="/usr/share/aif/profiles" PROFILES="" # iso-profiles path
# Edit Files # Edit Files
FILE="" # File(s) to be reviewed FILE="" # File(s) to be reviewed
@ -2202,20 +2202,6 @@ install_de_wm() {
} }
install_manjaro_de_wm() { install_manjaro_de_wm() {
# Only show this information box once
if [[ $SHOW_ONCE -eq 0 ]]; then
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_InstDETitle " --msgbox "This installs a package list and a desktop-settings package that correspond to manjaro editions of the same name." 0 0
SHOW_ONCE=1
fi
# download manjaro-tools.-isoprofiles git repo
if [[ -d $PROFILES ]]; then
git -C $PROFILES pull
else
git clone --depth 1 https://github.com/manjaro/iso-profiles.git $PROFILES
fi
# Clear packages after installing base # Clear packages after installing base
echo "" > /tmp/.desktop echo "" > /tmp/.desktop
# DE/WM Menu # DE/WM Menu
@ -2400,6 +2386,48 @@ install_manjaro_de_wm() {
} }
inst_needed() {
[[ ! $(pacman -Q $1 2>/dev/null) ]] && pacman -Sy --noconfirm $1
}
install_manjaro_de_wm_pkg() {
PROFILES="/usr/share/manjaro-tools"
# Only show this information box once
if [[ $SHOW_ONCE -eq 0 ]]; then
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_InstDETitle " --msgbox "This installs a package list and a desktop-settings package that correspond to manjaro editions of the same name." 0 0
SHOW_ONCE=1
fi
# install iso-profiles pkgs as needed
local pkgs=(manjaro-iso-profiles-{base,official,community})
for p in ${pkgs[@]}; do
inst_needed $p
done
install_manjaro_de_wm
}
install_manjaro_de_wm_git() {
PROFILES="/usr/share/aif/profiles"
# Only show this information box once
if [[ $SHOW_ONCE -eq 0 ]]; then
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_InstDETitle " --msgbox "This installs a package list and a desktop-settings package that correspond to manjaro editions of the same name." 0 0
SHOW_ONCE=1
fi
# install git if not yet installed
inst_needed git
# download manjaro-tools.-isoprofiles git repo
if [[ -f $PROFILES ]]; then
git -C $PROFILES pull
else
git clone --depth 1 https://github.com/manjaro/iso-profiles.git $PROFILES
fi
install_manjaro_de_wm
}
# Display Manager # Display Manager
install_dm() { install_dm() {
@ -2878,11 +2906,12 @@ install_graphics_menu() {
dialog --default-item ${HIGHLIGHT_SUB} --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_InstGrMenuTitle " --menu "$_InstGrMenuBody" 0 0 7 \ dialog --default-item ${HIGHLIGHT_SUB} --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_InstGrMenuTitle " --menu "$_InstGrMenuBody" 0 0 7 \
"1" "$_InstGrMenuDS" \ "1" "$_InstGrMenuDS" \
"2" "$_InstGrMenuDD" \ "2" "$_InstGrMenuDD" \
"3" "Install Manjaro Desktop" \ "3" "Install Manjaro Desktop (stable)" \
"4" "$_InstGrMenuGE" \ "4" "Install Manjaro Desktop (git)" \
"5" "$_InstGrMenuDM" \ "5" "$_InstGrMenuGE" \
"6" "$_PrepKBLayout" \ "6" "$_InstGrMenuDM" \
"7" "$_Back" 2>${ANSWER} "7" "$_PrepKBLayout" \
"8" "$_Back" 2>${ANSWER}
HIGHLIGHT_SUB=$(cat ${ANSWER}) HIGHLIGHT_SUB=$(cat ${ANSWER})
case $(cat ${ANSWER}) in case $(cat ${ANSWER}) in
@ -2890,13 +2919,15 @@ install_graphics_menu() {
;; ;;
"2") setup_graphics_card "2") setup_graphics_card
;; ;;
"3") install_manjaro_de_wm "3") install_manjaro_de_wm_pkg
;; ;;
"4") install_de_wm "4") install_manjaro_de_wm_git
;; ;;
"5") install_dm "5") install_de_wm
;; ;;
"6") set_xkbmap "6") install_dm
;;
"7") set_xkbmap
;; ;;
*) main_menu_online *) main_menu_online
;; ;;