aboutsummaryrefslogtreecommitdiff
path: root/scripts/embedded_scripts
diff options
context:
space:
mode:
authorRon Yorston <rmy@pobox.com>2022-01-06 07:46:38 +0000
committerRon Yorston <rmy@pobox.com>2022-01-06 07:46:38 +0000
commitb8751bbc9ac24e71fbe1e79c69074b4c87a134d8 (patch)
tree336d653df8387b9b1d3c6e46caa373c00cb9b2b2 /scripts/embedded_scripts
parentb15f68214da209b5b293039c09c00f490c0cc193 (diff)
parent6062c0d19bc201cbeb61b8875598cdd7a14a5ae0 (diff)
downloadbusybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.gz
busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.tar.bz2
busybox-w32-b8751bbc9ac24e71fbe1e79c69074b4c87a134d8.zip
Merge busybox into merge
Fix merge conflict in miscutils/less.c. Use exit_SUCCESS() where possible.
Diffstat (limited to 'scripts/embedded_scripts')
-rwxr-xr-xscripts/embedded_scripts6
1 files changed, 6 insertions, 0 deletions
diff --git a/scripts/embedded_scripts b/scripts/embedded_scripts
index aa7bf3e8a..205ac591a 100755
--- a/scripts/embedded_scripts
+++ b/scripts/embedded_scripts
@@ -23,6 +23,12 @@ if test $? != 0; then
23 exit 1 23 exit 1
24fi 24fi
25 25
26bzip2 </dev/null >/dev/null
27if test $? != 0; then
28 echo 'bzip2 is not installed'
29 exit 1
30fi
31
26custom_scripts="" 32custom_scripts=""
27if [ -d "$custom_loc" ] 33if [ -d "$custom_loc" ]
28then 34then