Skip to content

Commit a292391

Browse files
scripts(build-package.sh): use grep directly instead of cat | grep for checking built packages and quote variables for all related functions
1 parent e80fe6a commit a292391

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

build-package.sh

+6-4
Original file line numberDiff line numberDiff line change
@@ -382,21 +382,23 @@ fi
382382

383383
# Check if the package is in the compiled list
384384
termux_check_package_in_built_packages_list() {
385-
[ ! -f "$TERMUX_BUILD_PACKAGE_CALL_BUILT_PACKAGES_LIST_FILE_PATH" ] && termux_error_exit "ERROR: file '$TERMUX_BUILD_PACKAGE_CALL_BUILT_PACKAGES_LIST_FILE_PATH' not found."
386-
cat "$TERMUX_BUILD_PACKAGE_CALL_BUILT_PACKAGES_LIST_FILE_PATH" | grep -q " $1 "
385+
[ ! -f "$TERMUX_BUILD_PACKAGE_CALL_BUILT_PACKAGES_LIST_FILE_PATH" ] && \
386+
termux_error_exit "ERROR: file '$TERMUX_BUILD_PACKAGE_CALL_BUILT_PACKAGES_LIST_FILE_PATH' not found."
387+
grep -q " $1 " "$TERMUX_BUILD_PACKAGE_CALL_BUILT_PACKAGES_LIST_FILE_PATH"
387388
return $?
388389
}
389390

390391
# Adds a package to the list of built packages if it is not in the list
391392
termux_add_package_to_built_packages_list() {
392393
if ! termux_check_package_in_built_packages_list "$1"; then
393-
echo -n "$1 " >> $TERMUX_BUILD_PACKAGE_CALL_BUILT_PACKAGES_LIST_FILE_PATH
394+
echo -n "$1 " >> "$TERMUX_BUILD_PACKAGE_CALL_BUILT_PACKAGES_LIST_FILE_PATH"
394395
fi
395396
}
396397

397398
# Check if the package is in the compiling list
398399
termux_check_package_in_building_packages_list() {
399-
[ ! -f "$TERMUX_BUILD_PACKAGE_CALL_BUILDING_PACKAGES_LIST_FILE_PATH" ] && termux_error_exit "ERROR: file '$TERMUX_BUILD_PACKAGE_CALL_BUILDING_PACKAGES_LIST_FILE_PATH' not found."
400+
[ ! -f "$TERMUX_BUILD_PACKAGE_CALL_BUILDING_PACKAGES_LIST_FILE_PATH" ] && \
401+
termux_error_exit "ERROR: file '$TERMUX_BUILD_PACKAGE_CALL_BUILDING_PACKAGES_LIST_FILE_PATH' not found."
400402
grep -q "^${1}$" "$TERMUX_BUILD_PACKAGE_CALL_BUILDING_PACKAGES_LIST_FILE_PATH"
401403
return $?
402404
}

0 commit comments

Comments
 (0)