From dc4da4ff73cdf768b3b62910ceaad889b617bac6 Mon Sep 17 00:00:00 2001 From: obarun <eric@obarun.org> Date: Fri, 16 Aug 2019 15:23:42 +1100 Subject: [PATCH] fix path directory of file boot-user-<user>.conf --- module/boot-user-@/.configure/.xinitrc | 11 +++++++---- module/boot-user-@/.configure/.xsession | 10 ++++++---- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/module/boot-user-@/.configure/.xinitrc b/module/boot-user-@/.configure/.xinitrc index 28e3ede..421cc5a 100755 --- a/module/boot-user-@/.configure/.xinitrc +++ b/module/boot-user-@/.configure/.xinitrc @@ -7,12 +7,15 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then unset f fi -var=$(<${HOME}/.66/conf/boot-user-${USER}.conf) - -for i in ${var[@]}; do - export ${i} +list=( $(ls -1 ${HOME}/.66/conf/boot-user) ) +for i in ${list[@]};do + var=$(<${HOME}/.66/conf/boot-user/${i}) + for j in ${var[@]}; do + export ${j} + done done + 66-all up sleep 03 diff --git a/module/boot-user-@/.configure/.xsession b/module/boot-user-@/.configure/.xsession index 563b0b4..300a2ea 100755 --- a/module/boot-user-@/.configure/.xsession +++ b/module/boot-user-@/.configure/.xsession @@ -1,9 +1,11 @@ #!/usr/bin/bash -var=$(<${HOME}/.66/conf/boot-user-${USER}.conf) - -for i in ${var[@]}; do - export ${i} +list=( $(ls -1 ${HOME}/.66/conf/boot-user) ) +for i in ${list[@]};do + var=$(<${HOME}/.66/conf/boot-user/${i}) + for j in ${var[@]}; do + export ${j} + done done 66-all up -- GitLab