root/manjaro-tools
1
0
Fork 0
forked from mirrored-repos/manjaro-tools
Code Pull requests Activity

resolve unmet depends; move code to proper place

Browse source
This commit is contained in:
udeved 2016-09-18 17:29:51 +02:00
parent 1a2e12d117
commit 68d0c0cc07
3 changed files with 25 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Makefile
View file

@ -23,6 +23,8 @@ LIBS_BASE = \
SHARED_BASE = \
data/pacman-default.conf \
data/pacman-multilib.conf \
data/desktop.map \
data/linux.preset \
data/pacman-mirrors.conf
LIST_PKG = \
@ -76,8 +78,6 @@ LIBS_ISO = \
SHARED_ISO = \
data/pacman-mhwd.conf \
data/desktop.map \
data/linux.preset \
data/profile.conf.example
CPIOHOOKS = \

23
lib/util-iso-image.sh
View file

@ -140,29 +140,6 @@ configure_services(){
info "Done configuring [%s]" "${initsys}"
}
load_desktop_map(){
local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g" \
file=${DATADIR}/desktop.map
local desktop_map=$(sed "$_com_rm" "$file" \
| sed "$_space" \
| sed "$_clean")
echo ${desktop_map}
}
detect_desktop_env(){
local xs=$1/usr/share/xsessions ex=$1/usr/bin key val map=( $(load_desktop_map) )
default_desktop_file="none"
default_desktop_executable="none"
for item in "${map[@]}";do
key=${item%:*}
val=${item#*:}
if [[ -f $xs/$key.desktop ]] && [[ -f $ex/$val ]];then
default_desktop_file="$key"
default_desktop_executable="$val"
fi
done
}
write_live_session_conf(){
local path=$1${SYSCONFDIR}
[[ ! -d $path ]] && mkdir -p $path

23
lib/util.sh
View file

@ -473,6 +473,29 @@ get_edition(){
echo ${path##*/}
}
load_desktop_map(){
local _space="s| ||g" _clean=':a;N;$!ba;s/\n/ /g' _com_rm="s|#.*||g" \
file=${DATADIR}/desktop.map
local desktop_map=$(sed "$_com_rm" "$file" \
| sed "$_space" \
| sed "$_clean")
echo ${desktop_map}
}
detect_desktop_env(){
local xs=$1/usr/share/xsessions ex=$1/usr/bin key val map=( $(load_desktop_map) )
default_desktop_file="none"
default_desktop_executable="none"
for item in "${map[@]}";do
key=${item%:*}
val=${item#*:}
if [[ -f $xs/$key.desktop ]] && [[ -f $ex/$val ]];then
default_desktop_file="$key"
default_desktop_executable="$val"
fi
done
}
is_valid_de(){
if [[ ${default_desktop_executable} != "none" ]] && \
[[ ${default_desktop_file} != "none" ]]; then