mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-27 16:43:09 +02:00
make scripts/ipkg more portable by using printf instead of echo -n
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17729 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
eed31fd7a6
commit
2dee5f79dd
@ -794,7 +794,7 @@ Status: install ok pending" | ipkg_status_update_sd $sd $pkg
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
||||||
echo -n "Unpacking $pkg..."
|
printf "Unpacking $pkg..."
|
||||||
set +o noglob
|
set +o noglob
|
||||||
for file in $IPKG_TMP/$pkg/control/*; do
|
for file in $IPKG_TMP/$pkg/control/*; do
|
||||||
local base_file="`ipkg_file_part $file`"
|
local base_file="`ipkg_file_part $file`"
|
||||||
@ -809,7 +809,7 @@ Status: install ok pending" | ipkg_status_update_sd $sd $pkg
|
|||||||
fi
|
fi
|
||||||
echo "Done."
|
echo "Done."
|
||||||
|
|
||||||
echo -n "Configuring $pkg..."
|
printf "Configuring $pkg..."
|
||||||
export PKG_ROOT=$dest
|
export PKG_ROOT=$dest
|
||||||
if [ -x "$info_dir/$pkg.preinst" ]; then
|
if [ -x "$info_dir/$pkg.preinst" ]; then
|
||||||
if ! $info_dir/$pkg.preinst install; then
|
if ! $info_dir/$pkg.preinst install; then
|
||||||
@ -828,7 +828,7 @@ Status: install ok pending" | ipkg_status_update_sd $sd $pkg
|
|||||||
local use_maintainers_conffile=
|
local use_maintainers_conffile=
|
||||||
if [ -z "$FORCE_DEFAULTS" ]; then
|
if [ -z "$FORCE_DEFAULTS" ]; then
|
||||||
while true; do
|
while true; do
|
||||||
echo -n "Configuration file \`$conffile'
|
printf "Configuration file \`$conffile'
|
||||||
==> File on system created by you or by a script.
|
==> File on system created by you or by a script.
|
||||||
==> File also in package provided by package maintainer.
|
==> File also in package provided by package maintainer.
|
||||||
What would you like to do about it ? Your options are:
|
What would you like to do about it ? Your options are:
|
||||||
@ -960,7 +960,7 @@ ipkg_install_wanted() {
|
|||||||
if [ -n "$FORCE_DEFAULTS" ]; then
|
if [ -n "$FORCE_DEFAULTS" ]; then
|
||||||
echo "Installing them now."
|
echo "Installing them now."
|
||||||
else
|
else
|
||||||
echo -n "Install them now [Y/n] ? "
|
printf "Install them now [Y/n] ? "
|
||||||
read response
|
read response
|
||||||
case "$response" in
|
case "$response" in
|
||||||
[Nn] | [Nn][Oo])
|
[Nn] | [Nn][Oo])
|
||||||
|
Loading…
Reference in New Issue
Block a user