Check if the the suggested services are

installed before enabling them. Move
iso-profiles from /tmp to permanent
location.
merge-requests/273/head
Chrysostomus 8 years ago
parent 981681bbc5
commit 07020bb29d

@ -85,7 +85,7 @@ XKBMAP="us" # X11 keyboard layout. Default is "us"
ZONE="" # For time
SUBZONE="" # For time
LOCALE="en_US.UTF-8" # System locale. Default is "en_US.UTF-8"
PROFILES="/usr/share/aif/profiles"
# Edit Files
FILE="" # File(s) to be reviewed
@ -2177,28 +2177,28 @@ install_manjaro_de_wm() {
fi
# download manjaro-tools.-isoprofiles git repo
if [[ -d /tmp/profiles ]]; then
git -C /tmp/profiles pull
if [[ -d $PROFILES ]]; then
git -C $PROFILES pull
else
git clone --depth 1 https://github.com/manjaro/iso-profiles.git /tmp/profiles
git clone --depth 1 https://github.com/manjaro/iso-profiles.git $PROFILES
fi
# Clear packages after installing base
echo "" > /tmp/.desktop
# DE/WM Menu
dialog --backtitle "$VERSION - $SYSTEM ($ARCHI)" --title " $_InstDETitle " --radiolist "$_InstDEBody $_UseSpaceBar" 0 0 12 \
$(echo /tmp/profiles/{manjaro,community}/* | xargs -n1 | cut -f5 -d/ | grep -v "netinstall" |awk '$0=$0" - off"') 2> /tmp/.desktop
$(echo $PROFILES/{manjaro,community}/* | xargs -n1 | cut -f7 -d/ | grep -v "netinstall" |awk '$0=$0" - off"') 2> /tmp/.desktop
# If something has been selected, install
if [[ $(cat /tmp/.desktop) != "" ]]; then
# Source the iso-profile
profile=$(echo /tmp/profiles/*/$(cat /tmp/.desktop)/profile.conf)
profile=$(echo $PROFILES/*/$(cat /tmp/.desktop)/profile.conf)
. $profile
overlay=$(echo /tmp/profiles/*/$(cat /tmp/.desktop)/desktop-overlay/)
overlay=$(echo $PROFILES/*/$(cat /tmp/.desktop)/desktop-overlay/)
echo $displaymanager > /tmp/.display-manager
target_desktop=$(echo /tmp/profiles/*/$(cat /tmp/.desktop)/Packages-Desktop)
target_desktop=$(echo $PROFILES/*/$(cat /tmp/.desktop)/Packages-Desktop)
# Parse package list based on user input and remove parts that don't belong to pacman
cat /tmp/profiles/shared/Packages-Root "$target_desktop" > /tmp/.edition
cat $PROFILES/shared/Packages-Root "$target_desktop" > /tmp/.edition
if [[ -e /tmp/.openrc ]]; then
# Remove any packages tagged with >systemd and remove >openrc tags
sed -i '/>systemd/d' /tmp/.edition
@ -2276,8 +2276,10 @@ install_manjaro_de_wm() {
fi
else
eval $(grep -e "enable_systemd=" $profile | sed 's/# //g')
echo "${enable_systemd[@]}" > /mnt/tmp/.services
arch_chroot "systemctl enable $(cat /mnt/tmp/.services)"
echo "${enable_systemd[@]}" | xargs -n1 > /tmp/.services
echo /mnt/usr/lib/systemd/system/* | xargs -n1 | cut -d/ -f7 | sed 's/.service//g' > /tmp/.available_services
grep -f /tmp/.available_services /tmp/.services > /tmp/.fix && mv /tmp/.fix /tmp/.services
arch_chroot "systemctl enable $(cat /tmp/.services)"
arch_chroot "systemctl disable pacman-init"
# enable display manager for systemd
if [[ "$(cat /tmp/.display-manager)" == lightdm ]]; then

Loading…
Cancel
Save