jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-29 13:46:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

config/functions: reduce use of basename and dirname

Browse Source 
Signed-off-by: Ian Leonard <antonlacon@gmail.com>
This commit is contained in:
Ian Leonard 2021-03-12 02:53:45 +00:00
parent 2e21000d38
commit 279d726b9f
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
config/functions
View File

@ -669,7 +669,7 @@ init_package_cache() {
export _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL export _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL
# overwrite existing cache files only when they are invalid, or not yet created # overwrite existing cache files only when they are invalid, or not yet created
mkdir -p "$(dirname "${_CACHE_PACKAGE_GLOBAL}")" mkdir -p "${_CACHE_PACKAGE_GLOBAL%/*}"
if [ -f "${_CACHE_PACKAGE_LOCAL}" ] && cmp -s "${temp_local}" "${_CACHE_PACKAGE_LOCAL}"; then if [ -f "${_CACHE_PACKAGE_LOCAL}" ] && cmp -s "${temp_local}" "${_CACHE_PACKAGE_LOCAL}"; then
rm "${temp_local}" rm "${temp_local}"
else else
@ -781,7 +781,7 @@ check_arch() {
for arch in ${linux_config_dir}/*.conf ${linux_config_dir}/*/linux.${TARGET_ARCH}.conf; do for arch in ${linux_config_dir}/*.conf ${linux_config_dir}/*/linux.${TARGET_ARCH}.conf; do
[[ ${arch} =~ .*\*.* ]] && continue #ignore unexpanded wildcard [[ ${arch} =~ .*\*.* ]] && continue #ignore unexpanded wildcard
arch_err_msg+="\n - $(basename ${arch} | cut -f2 -d".")" arch_err_msg+="\n - $(echo ${arch##*/} | cut -f2 -d".")"
done done
die "${arch_err_msg}" die "${arch_err_msg}"
fi fi
@ -1128,7 +1128,7 @@ source_package() {
unset_functions unset_functions
if [ -n "${1}" ]; then if [ -n "${1}" ]; then
[ -f "${1}" ] && PKG_DIR="$(dirname "${1}")" || PKG_DIR="$(get_pkg_directory "${1}")" [ -f "${1}" ] && PKG_DIR="${1%/*}" || PKG_DIR="$(get_pkg_directory "${1}")"
[ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ] || die "FAILURE: unable to source package - ${1}/package.mk does not exist" [ -n "$PKG_DIR" -a -r $PKG_DIR/package.mk ] || die "FAILURE: unable to source package - ${1}/package.mk does not exist"
@ -1423,7 +1423,7 @@ done
for f in $PKG_DIR/source/resources/screenshot-*.{jpg,png}; do for f in $PKG_DIR/source/resources/screenshot-*.{jpg,png}; do
if [ -f "$f" ]; then if [ -f "$f" ]; then
screenshots+="<screenshot>resources/$(basename $f)</screenshot>\n" screenshots+="<screenshot>resources/${f##*/}</screenshot>\n"
fi fi
done done