forked from mirrored-repos/manjaro-tools
rename two vars and a function
This commit is contained in:
parent
6e7f540309
commit
e5b9533299
12 changed files with 37 additions and 37 deletions
2
Makefile
2
Makefile
|
@ -106,7 +106,7 @@ MAN_XML = \
|
|||
|
||||
all: $(BIN_BASE) $(BIN_PKG) $(BIN_ISO) doc
|
||||
|
||||
edit = sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/manjaro-tools|g" \
|
||||
edit = sed -e "s|@datadir[@]|$(DESTDIR)$(PREFIX)/share/manjaro-tools|g" \
|
||||
-e "s|@sysconfdir[@]|$(DESTDIR)$(SYSCONFDIR)/manjaro-tools|g" \
|
||||
-e "s|@libdir[@]|$(DESTDIR)$(PREFIX)/lib/manjaro-tools|g" \
|
||||
-e "s|@version@|${Version}|"
|
||||
|
|
|
@ -12,7 +12,7 @@ version=@version@
|
|||
|
||||
shopt -s extglob
|
||||
|
||||
PKGDATADIR='@pkgdatadir@'
|
||||
DATADIR='@datadir@'
|
||||
LIBDIR='@libdir@'
|
||||
|
||||
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
version=@version@
|
||||
|
||||
LIBDIR='@libdir@'
|
||||
PKGDATADIR='@pkgdatadir@'
|
||||
DATADIR='@datadir@'
|
||||
SYSCONFDIR='@sysconfdir@'
|
||||
|
||||
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
||||
|
@ -67,7 +67,7 @@ display_settings(){
|
|||
|
||||
msg "PROFILE:"
|
||||
msg2 "sets_dir_iso: ${sets_dir_iso}"
|
||||
msg2 "buildsets: $(load_sets ${sets_dir_iso})"
|
||||
msg2 "buildsets: $(list_sets ${sets_dir_iso})"
|
||||
msg2 "buildset_iso: ${buildset_iso}"
|
||||
msg2 "is_buildset: ${is_buildset}"
|
||||
msg2 "profile_repo: ${profile_repo}"
|
||||
|
@ -102,7 +102,7 @@ display_settings(){
|
|||
|
||||
load_user_info
|
||||
|
||||
load_config "${USER_CONFIG}/manjaro-tools.conf"
|
||||
load_config "${USERCONFDIR}/manjaro-tools.conf"
|
||||
load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
|
||||
# to force old way to have buildiso run in iso-profiles dir
|
||||
|
@ -167,7 +167,7 @@ timer_start=$(get_timer)
|
|||
|
||||
[[ "${arch}" == 'x86_64' ]] && pacman_conf_arch='multilib'
|
||||
|
||||
mirrors_conf="${PKGDATADIR}/pacman-mirrors-${branch}.conf"
|
||||
mirrors_conf="${DATADIR}/pacman-mirrors-${branch}.conf"
|
||||
|
||||
check_root "$0" "${orig_argv[@]}"
|
||||
|
||||
|
|
|
@ -14,7 +14,7 @@ version=@version@
|
|||
shopt -s nullglob
|
||||
|
||||
LIBDIR='@libdir@'
|
||||
PKGDATADIR='@pkgdatadir@'
|
||||
DATADIR='@datadir@'
|
||||
SYSCONFDIR='@sysconfdir@'
|
||||
|
||||
[[ -r ${LIBDIR}/util-msg.sh ]] && source ${LIBDIR}/util-msg.sh
|
||||
|
@ -37,7 +37,7 @@ display_settings(){
|
|||
|
||||
msg "PROFILE:"
|
||||
msg2 "sets_dir_pkg: ${sets_dir_pkg}"
|
||||
msg2 "buildsets: $(load_sets ${sets_dir_pkg})"
|
||||
msg2 "buildsets: $(list_sets ${sets_dir_pkg})"
|
||||
msg2 "buildset_pkg: ${buildset_pkg}"
|
||||
msg2 "is_buildset: ${is_buildset}"
|
||||
|
||||
|
@ -70,7 +70,7 @@ display_settings(){
|
|||
|
||||
load_user_info
|
||||
|
||||
load_config "${USER_CONFIG}/manjaro-tools.conf"
|
||||
load_config "${USERCONFDIR}/manjaro-tools.conf"
|
||||
load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
|
||||
load_vars "$USER_HOME/.makepkg.conf"
|
||||
|
@ -141,9 +141,9 @@ else
|
|||
is_multilib=false
|
||||
fi
|
||||
|
||||
pacman_conf="${PKGDATADIR}/pacman-${pacman_conf_arch}.conf"
|
||||
makepkg_conf="${PKGDATADIR}/makepkg-${arch}.conf"
|
||||
mirrors_conf="${PKGDATADIR}/pacman-mirrors-${branch}.conf"
|
||||
pacman_conf="${DATADIR}/pacman-${pacman_conf_arch}.conf"
|
||||
makepkg_conf="${DATADIR}/makepkg-${arch}.conf"
|
||||
mirrors_conf="${DATADIR}/pacman-mirrors-${branch}.conf"
|
||||
|
||||
mkchroot_args+=(-C ${pacman_conf} -M ${makepkg_conf} -S ${mirrors_conf} -B "${build_mirror}/${branch}")
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@ display_settings(){
|
|||
|
||||
load_user_info
|
||||
|
||||
load_config "${USER_CONFIG}/manjaro-tools.conf"
|
||||
load_config "${USERCONFDIR}/manjaro-tools.conf"
|
||||
load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
|
||||
sync=false
|
||||
|
|
|
@ -33,7 +33,7 @@ display_settings(){
|
|||
|
||||
msg "PROFILE:"
|
||||
msg2 "sets_dir_iso: ${sets_dir_iso}"
|
||||
msg2 "buildsets: $(load_sets ${sets_dir_iso})"
|
||||
msg2 "buildsets: $(list_sets ${sets_dir_iso})"
|
||||
msg2 "buildset_iso: ${buildset_iso}"
|
||||
msg2 "is_buildset: ${is_buildset}"
|
||||
|
||||
|
@ -62,7 +62,7 @@ display_settings(){
|
|||
|
||||
load_user_info
|
||||
|
||||
load_config "${USER_CONFIG}/manjaro-tools.conf"
|
||||
load_config "${USERCONFDIR}/manjaro-tools.conf"
|
||||
load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
|
||||
run_dir=${cache_dir_iso}
|
||||
|
|
|
@ -35,7 +35,7 @@ display_settings(){
|
|||
|
||||
load_user_info
|
||||
|
||||
load_config "${USER_CONFIG}/manjaro-tools.conf"
|
||||
load_config "${USERCONFDIR}/manjaro-tools.conf"
|
||||
load_config "${SYSCONFDIR}/manjaro-tools.conf"
|
||||
|
||||
automount=false
|
||||
|
|
|
@ -10,13 +10,13 @@
|
|||
# GNU General Public License for more details.
|
||||
|
||||
copy_efi_shells(){
|
||||
if [[ -f ${PKGDATADIR}/efi_shell/shellx64_v1.efi ]];then
|
||||
if [[ -f ${DATADIR}/efi_shell/shellx64_v1.efi ]];then
|
||||
msg2 "Copying shellx64_v1.efi ..."
|
||||
cp ${PKGDATADIR}/efi_shell/shellx64_v1.efi $1/
|
||||
cp ${DATADIR}/efi_shell/shellx64_v1.efi $1/
|
||||
fi
|
||||
if [[ -f ${PKGDATADIR}/efi_shell/shellx64_v2.efi ]];then
|
||||
if [[ -f ${DATADIR}/efi_shell/shellx64_v2.efi ]];then
|
||||
msg2 "Copying shellx64_v2.efi ..."
|
||||
cp ${PKGDATADIR}/efi_shell/shellx64_v2.efi $1/
|
||||
cp ${DATADIR}/efi_shell/shellx64_v2.efi $1/
|
||||
fi
|
||||
}
|
||||
|
||||
|
|
|
@ -20,8 +20,8 @@ copy_overlay(){
|
|||
|
||||
copy_startup_scripts(){
|
||||
msg2 "Copying startup scripts ..."
|
||||
cp ${PKGDATADIR}/scripts/livecd $1
|
||||
cp ${PKGDATADIR}/scripts/mhwd-live $1
|
||||
cp ${DATADIR}/scripts/livecd $1
|
||||
cp ${DATADIR}/scripts/mhwd-live $1
|
||||
chmod +x $1/livecd
|
||||
chmod +x $1/mhwd-live
|
||||
}
|
||||
|
@ -42,7 +42,7 @@ copy_livecd_helpers(){
|
|||
cp ${LIBDIR}/util-livecd.sh $1
|
||||
cp ${LIBDIR}/util-msg.sh $1
|
||||
cp ${LIBDIR}/util.sh $1
|
||||
cp ${PKGDATADIR}/scripts/kbd-model-map $1
|
||||
cp ${DATADIR}/scripts/kbd-model-map $1
|
||||
|
||||
cp ${profile_conf} $1
|
||||
|
||||
|
|
|
@ -238,7 +238,7 @@ make_image_mhwd() {
|
|||
rm ${path}/opt/livecd/pkgs/${mhwd_clean}
|
||||
done
|
||||
fi
|
||||
cp ${PKGDATADIR}/pacman-gfx.conf ${path}/opt/livecd
|
||||
cp ${DATADIR}/pacman-gfx.conf ${path}/opt/livecd
|
||||
make_repo "${path}"
|
||||
configure_mhwd_drivers "${path}"
|
||||
|
||||
|
@ -467,7 +467,7 @@ check_custom_pacman_conf(){
|
|||
pacman_conf="$1/pacman-${pacman_conf_arch}.conf"
|
||||
is_custom_pac_conf=true
|
||||
else
|
||||
pacman_conf="${PKGDATADIR}/pacman-${pacman_conf_arch}.conf"
|
||||
pacman_conf="${DATADIR}/pacman-${pacman_conf_arch}.conf"
|
||||
is_custom_pac_conf=false
|
||||
fi
|
||||
}
|
||||
|
|
|
@ -29,7 +29,7 @@ load_group(){
|
|||
_clean=':a;N;$!ba;s/\n/ /g' \
|
||||
_com_rm="s|#.*||g" \
|
||||
devel_packages='' \
|
||||
file=${PKGDATADIR}/base-devel-udev
|
||||
file=${DATADIR}/base-devel-udev
|
||||
|
||||
msg3 "Loading Group [$file] ..."
|
||||
|
||||
|
|
22
lib/util.sh
22
lib/util.sh
|
@ -19,7 +19,7 @@ read_set(){
|
|||
}
|
||||
|
||||
# $1: sets_dir
|
||||
load_sets(){
|
||||
list_sets(){
|
||||
local prof temp
|
||||
for item in $(ls $1/*.set); do
|
||||
temp=${item##*/}
|
||||
|
@ -33,7 +33,7 @@ load_sets(){
|
|||
# $2: buildset
|
||||
eval_buildset(){
|
||||
eval "case $2 in
|
||||
$(load_sets $1)) is_buildset=true ;;
|
||||
$(list_sets $1)) is_buildset=true ;;
|
||||
*) is_buildset=false ;;
|
||||
esac"
|
||||
${is_buildset} && read_set $1/$2
|
||||
|
@ -144,7 +144,7 @@ init_buildpkg(){
|
|||
|
||||
prepare_dir "${sets_dir_pkg}"
|
||||
|
||||
[[ -d $USER_CONFIG/pkg.d ]] && sets_dir_pkg=$USER_CONFIG/pkg.d
|
||||
[[ -d ${USERCONFDIR}/pkg.d ]] && sets_dir_pkg=${USERCONFDIR}/pkg.d
|
||||
|
||||
[[ -z ${buildset_pkg} ]] && buildset_pkg='default'
|
||||
|
||||
|
@ -158,7 +158,7 @@ init_buildiso(){
|
|||
|
||||
prepare_dir "${sets_dir_iso}"
|
||||
|
||||
[[ -d $USER_CONFIG/iso.d ]] && sets_dir_iso=$USER_CONFIG/iso.d
|
||||
[[ -d ${USERCONFDIR}/iso.d ]] && sets_dir_iso=${USERCONFDIR}/iso.d
|
||||
|
||||
[[ -z ${buildset_iso} ]] && buildset_iso='default'
|
||||
|
||||
|
@ -325,7 +325,7 @@ write_repo_conf(){
|
|||
for r in ${repos[@]}; do
|
||||
path=${r%/.*}
|
||||
name=${path##*/}
|
||||
echo run_dir=$path > $USER_CONFIG/$name.conf
|
||||
echo run_dir=$path > ${USERCONFDIR}/$name.conf
|
||||
done
|
||||
}
|
||||
|
||||
|
@ -338,13 +338,13 @@ load_user_info(){
|
|||
USER_HOME=$HOME
|
||||
fi
|
||||
|
||||
USER_CONFIG="$USER_HOME/.config/manjaro-tools"
|
||||
prepare_dir "$USER_CONFIG"
|
||||
USERCONFDIR="$USER_HOME/.config/manjaro-tools"
|
||||
prepare_dir "${USERCONFDIR}"
|
||||
}
|
||||
|
||||
load_run_dir(){
|
||||
[[ -f $USER_CONFIG/$1.conf ]] || write_repo_conf
|
||||
[[ -r $USER_CONFIG/$1.conf ]] && source $USER_CONFIG/$1.conf
|
||||
[[ -f ${USERCONFDIR}/$1.conf ]] || write_repo_conf
|
||||
[[ -r ${USERCONFDIR}/$1.conf ]] && source ${USERCONFDIR}/$1.conf
|
||||
return 0
|
||||
}
|
||||
|
||||
|
@ -354,8 +354,8 @@ show_version(){
|
|||
}
|
||||
|
||||
show_config(){
|
||||
if [[ -f ${USER_CONFIG}/manjaro-tools.conf ]]; then
|
||||
msg2 "user_config: ${USER_CONFIG}/manjaro-tools.conf"
|
||||
if [[ -f ${USERCONFDIR}/manjaro-tools.conf ]]; then
|
||||
msg2 "user_config: ${USERCONFDIR}/manjaro-tools.conf"
|
||||
else
|
||||
msg2 "manjaro_tools_conf: ${manjaro_tools_conf}"
|
||||
fi
|
||||
|
|
Loading…
Reference in a new issue