Skip to content

Commit 090a261

Browse files
harryfrzzharryfrzz
authored
Merge branch 'termux:master' into feature_branch
2 parents 24af284 + 7007359 commit 090a261

File tree

101 files changed

+3476
-233
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

101 files changed

+3476
-233
lines changed

‎build-package.sh‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,7 @@ fi
424424
# Check if the package is in the compiled list
425425
termux_check_package_in_built_packages_list() {
426426
[[ ! -f "$TERMUX_BUILD_PACKAGE_CALL_BUILT_PACKAGES_LIST_FILE_PATH" ]] && \
427-
termux_error_exit "ERROR: file '$TERMUX_BUILD_PACKAGE_CALL_BUILT_PACKAGES_LIST_FILE_PATH' not found."
427+
termux_error_exit "file '$TERMUX_BUILD_PACKAGE_CALL_BUILT_PACKAGES_LIST_FILE_PATH' not found."
428428
# slightly faster than `grep -q $word $file`
429429
[[ " $(< "$TERMUX_BUILD_PACKAGE_CALL_BUILT_PACKAGES_LIST_FILE_PATH") " == *" $1 "* ]]
430430
return $?
@@ -440,7 +440,7 @@ termux_add_package_to_built_packages_list() {
440440
# Check if the package is in the compiling list
441441
termux_check_package_in_building_packages_list() {
442442
[[ ! -f "$TERMUX_BUILD_PACKAGE_CALL_BUILDING_PACKAGES_LIST_FILE_PATH" ]] && \
443-
termux_error_exit "ERROR: file '$TERMUX_BUILD_PACKAGE_CALL_BUILDING_PACKAGES_LIST_FILE_PATH' not found."
443+
termux_error_exit "file '$TERMUX_BUILD_PACKAGE_CALL_BUILDING_PACKAGES_LIST_FILE_PATH' not found."
444444
# slightly faster than `grep -q $word $file`
445445
[[ $'\n'"$(<"$TERMUX_BUILD_PACKAGE_CALL_BUILDING_PACKAGES_LIST_FILE_PATH")"$'\n' == *$'\n'"$1"$'\n'* ]]
446446
return $?

‎disabled-packages/botan2/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,6 @@ termux_step_configure() {
3535
termux_step_post_massage() {
3636
local _GUARD_FILE="lib/libbotan-2.so"
3737
if [ ! -e "${_GUARD_FILE}" ]; then
38-
termux_error_exit "Error: file ${_GUARD_FILE} not found."
38+
termux_error_exit "file ${_GUARD_FILE} not found."
3939
fi
4040
}

‎disabled-packages/box86/build.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ termux_pkg_auto_update() {
3434

3535
local latest_commit_date_tz=$(curl -s "https://api.github.com/repos/ptitSeb/box86/commits/${latest_commit}" | jq .commit.committer.date | sed -e 's|\"||g')
3636
if [[ -z "${latest_commit_date_tz}" ]]; then
37-
termux_error_exit "ERROR: Unable to get latest commit date info"
37+
termux_error_exit "Unable to get latest commit date info"
3838
fi
3939

4040
local latest_commit_date=$(echo "${latest_commit_date_tz}" | sed -e 's|\(.*\)T\(.*\)Z|\1|' -e 's|\-||g')
@@ -54,14 +54,14 @@ termux_pkg_auto_update() {
5454
fi
5555

5656
if ! dpkg --compare-versions "${latest_version}" gt "${TERMUX_PKG_VERSION}"; then
57-
termux_error_exit "ERROR: Resulting latest version is not counted as update to the current version (${latest_version} < ${TERMUX_PKG_VERSION})"
57+
termux_error_exit "Resulting latest version is not counted as update to the current version (${latest_version} < ${TERMUX_PKG_VERSION})"
5858
fi
5959

6060
# unlikely to happen
6161
if [[ "${latest_commit_date}" -lt "${_COMMIT_DATE}" ]]; then
62-
termux_error_exit "ERROR: Upstream is older than current package version. Please report to upstream."
62+
termux_error_exit "Upstream is older than current package version. Please report to upstream."
6363
elif [[ "${latest_commit_date}" -eq "${_COMMIT_DATE}" ]] && [[ "${latest_commit_time}" -lt "${_COMMIT_TIME}" ]]; then
64-
termux_error_exit "ERROR: Upstream is older than current package version. Please report to upstream."
64+
termux_error_exit "Upstream is older than current package version. Please report to upstream."
6565
fi
6666

6767
sed -i "${TERMUX_PKG_BUILDER_DIR}/build.sh" \

‎disabled-packages/fex/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ TERMUX_PKG_EXTRA_CONFIGURE_ARGS="
2525

2626
termux_pkg_auto_update() {
2727
local latest_tag="$(termux_github_api_get_tag "${TERMUX_PKG_SRCURL}")"
28-
[[ -z "${latest_tag}" ]] && termux_error_exit "ERROR: Unable to get tag from ${TERMUX_PKG_SRCURL}"
28+
[[ -z "${latest_tag}" ]] && termux_error_exit "Unable to get tag from ${TERMUX_PKG_SRCURL}"
2929
termux_pkg_upgrade_version "${latest_tag#FEX-}"
3030
}
3131

‎disabled-packages/gl4es/build.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ termux_pkg_auto_update() {
3030

3131
local latest_commit_date_tz=$(curl -s "https://api.github.com/repos/ptitSeb/gl4es/commits/${latest_commit}" | jq .commit.committer.date | sed -e 's|\"||g')
3232
if [[ -z "${latest_commit_date_tz}" ]]; then
33-
termux_error_exit "ERROR: Unable to get latest commit date info"
33+
termux_error_exit "Unable to get latest commit date info"
3434
fi
3535

3636
local latest_commit_date=$(echo "${latest_commit_date_tz}" | sed -e 's|\(.*\)T\(.*\)Z|\1|' -e 's|\-||g')
@@ -50,14 +50,14 @@ termux_pkg_auto_update() {
5050
fi
5151

5252
if ! dpkg --compare-versions "${latest_version}" gt "${TERMUX_PKG_VERSION}"; then
53-
termux_error_exit "ERROR: Resulting latest version is not counted as update to the current version (${latest_version} < ${TERMUX_PKG_VERSION})"
53+
termux_error_exit "Resulting latest version is not counted as update to the current version (${latest_version} < ${TERMUX_PKG_VERSION})"
5454
fi
5555

5656
# unlikely to happen
5757
if [[ "${latest_commit_date}" -lt "${_COMMIT_DATE}" ]]; then
58-
termux_error_exit "ERROR: Upstream is older than current package version. Please report to upstream."
58+
termux_error_exit "Upstream is older than current package version. Please report to upstream."
5959
elif [[ "${latest_commit_date}" -eq "${_COMMIT_DATE}" ]] && [[ "${latest_commit_time}" -lt "${_COMMIT_TIME}" ]]; then
60-
termux_error_exit "ERROR: Upstream is older than current package version. Please report to upstream."
60+
termux_error_exit "Upstream is older than current package version. Please report to upstream."
6161
fi
6262

6363
sed -i "${TERMUX_PKG_BUILDER_DIR}/build.sh" \

‎disabled-packages/gtksourceview3/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ termux_step_pre_configure() {
2222
termux_step_post_massage() {
2323
local _GUARD_FILE="lib/libgtksourceview-3.0.so"
2424
if [ ! -e "${_GUARD_FILE}" ]; then
25-
termux_error_exit "Error: file ${_GUARD_FILE} not found."
25+
termux_error_exit "file ${_GUARD_FILE} not found."
2626
fi
2727
}

‎disabled-packages/libgtksourceviewmm-3.0/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,6 @@ termux_step_pre_configure() {
1818
termux_step_post_massage() {
1919
local _GUARD_FILE="lib/${TERMUX_PKG_NAME}.so"
2020
if [ ! -e "${_GUARD_FILE}" ]; then
21-
termux_error_exit "Error: file ${_GUARD_FILE} not found."
21+
termux_error_exit "file ${_GUARD_FILE} not found."
2222
fi
2323
}

‎disabled-packages/libhandy-0.0/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ termux_step_pre_configure() {
2525
termux_step_post_massage() {
2626
local _GUARD_FILE="lib/${TERMUX_PKG_NAME}.so"
2727
if [ ! -e "${_GUARD_FILE}" ]; then
28-
termux_error_exit "Error: file ${_GUARD_FILE} not found."
28+
termux_error_exit "file ${_GUARD_FILE} not found."
2929
fi
3030
}

‎disabled-packages/libunique/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ termux_step_post_configure() {
3131
termux_step_post_massage() {
3232
local _GUARD_FILE="lib/libunique-3.0.so"
3333
if [ ! -e "${_GUARD_FILE}" ]; then
34-
termux_error_exit "Error: file ${_GUARD_FILE} not found."
34+
termux_error_exit "file ${_GUARD_FILE} not found."
3535
fi
3636
}

‎disabled-packages/webkit2gtk-4.0/build.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,6 @@ termux_step_pre_configure() {
4545
termux_step_post_massage() {
4646
local _GUARD_FILE="lib/lib${TERMUX_PKG_NAME}-4.0.so"
4747
if [ ! -e "${_GUARD_FILE}" ]; then
48-
termux_error_exit "Error: file ${_GUARD_FILE} not found."
48+
termux_error_exit "file ${_GUARD_FILE} not found."
4949
fi
5050
}

0 commit comments

Comments
 (0)