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

Merge pull request #810 from MilhouseVH/path_optimise_fix

Browse Source 
path: remove regex dependency when processing packages
This commit is contained in:
Lukas Rusak 2016-10-12 13:57:45 -07:00 committed by GitHub
commit 8d1ad3236d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
config/path
View File

@ -77,6 +77,7 @@ SED="sed -i"
_PKG_ROOT_NAME=${1%:*} _PKG_ROOT_NAME=${1%:*}
_ALL_DIRS="" _ALL_DIRS=""
_FOUND=0 _FOUND=0
_ANCHOR="@?+?@"
PKG_DIR="" PKG_DIR=""
# If the package caches are unset, then populate them # If the package caches are unset, then populate them
@ -86,19 +87,20 @@ SED="sed -i"
# cache project folder for a package # cache project folder for a package
for DIR in $(find $ROOT/projects/$PROJECT/packages -type d 2>/dev/null); do for DIR in $(find $ROOT/projects/$PROJECT/packages -type d 2>/dev/null); do
[ -r "$DIR/package.mk" ] && _CACHE_PACKAGE_LOCAL+="${DIR}\n" [ -r "$DIR/package.mk" ] && _CACHE_PACKAGE_LOCAL+="${DIR}${_ANCHOR}\n"
done done
# cache packages folder # cache packages folder
for DIR in $(find $ROOT/$PACKAGES -type d 2>/dev/null); do for DIR in $(find $ROOT/$PACKAGES -type d 2>/dev/null); do
[ -r "$DIR/package.mk" ] && _CACHE_PACKAGE_GLOBAL+="${DIR}\n" [ -r "$DIR/package.mk" ] && _CACHE_PACKAGE_GLOBAL+="${DIR}${_ANCHOR}\n"
done done
export _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL export _CACHE_PACKAGE_LOCAL _CACHE_PACKAGE_GLOBAL
fi fi
# Check for any available local package in preference to a global package # Check for any available local package in preference to a global package
for DIR in $(echo -e "${_CACHE_PACKAGE_LOCAL}" | grep -E "^.*/${_PKG_ROOT_NAME}\$"); do for DIR in $(echo -e "${_CACHE_PACKAGE_LOCAL}" | grep -F "/${_PKG_ROOT_NAME}${_ANCHOR}"); do
DIR="${DIR%${_ANCHOR}}"
# found first, set $PKG_DIR # found first, set $PKG_DIR
PKG_DIR="$DIR" PKG_DIR="$DIR"
# keep track of dirs with package.mk for detecting multiple folders # keep track of dirs with package.mk for detecting multiple folders
@ -108,7 +110,8 @@ SED="sed -i"
# If there's no local package available, use the global package # If there's no local package available, use the global package
if [ $_FOUND -eq 0 ]; then if [ $_FOUND -eq 0 ]; then
for DIR in $(echo -e "${_CACHE_PACKAGE_GLOBAL}" | grep -E "^.*/${_PKG_ROOT_NAME}\$"); do for DIR in $(echo -e "${_CACHE_PACKAGE_GLOBAL}" | grep -F "/${_PKG_ROOT_NAME}${_ANCHOR}"); do
DIR="${DIR%${_ANCHOR}}"
# found first, set $PKG_DIR # found first, set $PKG_DIR
PKG_DIR="$DIR" PKG_DIR="$DIR"
# keep track of dirs with package.mk for detecting multiple folders # keep track of dirs with package.mk for detecting multiple folders