diff options
| -rwxr-xr-x | bin/newbin | 10 | ||||
| -rwxr-xr-x | bin/newdoc | 10 | ||||
| -rwxr-xr-x | bin/newexe | 10 | ||||
| -rwxr-xr-x | bin/newins | 10 | ||||
| -rwxr-xr-x | bin/newlib.a | 10 | ||||
| -rwxr-xr-x | bin/newlib.so | 10 | ||||
| -rwxr-xr-x | bin/newman | 10 | ||||
| -rwxr-xr-x | bin/newsbin | 10 |
8 files changed, 40 insertions, 40 deletions
diff --git a/bin/newbin b/bin/newbin index a5749ce26..699b9a687 100755 --- a/bin/newbin +++ b/bin/newbin @@ -3,11 +3,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/newbin,v 1.7 2004/10/04 13:56:50 vapier Exp $ -if [ -z "${T}" ] || [ -z "${2}" ] ; then - echo "Nothing defined to do." +if [[ -z ${T} ]] || [[ -z ${2} ]] ; then + echo "$0: Need two arguments, old file and new file" 1>&2 exit 1 fi -rm -rf "${T}/${2}" -cp "${1}" "${T}/${2}" -dobin "${T}/${2}" +rm -rf "${T}/${2}" && \ +cp -f "${1}" "${T}/${2}" && \ +exec dobin "${T}/${2}" diff --git a/bin/newdoc b/bin/newdoc index 456aaa90d..d3b83565b 100755 --- a/bin/newdoc +++ b/bin/newdoc @@ -3,11 +3,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/newdoc,v 1.7 2004/10/04 13:56:50 vapier Exp $ -if [ -z "${T}" ] || [ -z "${2}" ] ; then - echo "Nothing defined to do." +if [[ -z ${T} ]] || [[ -z ${2} ]] ; then + echo "$0: Need two arguments, old file and new file" 1>&2 exit 1 fi -rm -rf "${T}/${2}" -cp "${1}" "${T}/${2}" -dodoc "${T}/${2}" +rm -rf "${T}/${2}" && \ +cp -f "${1}" "${T}/${2}" && \ +exec dodoc "${T}/${2}" diff --git a/bin/newexe b/bin/newexe index 00c2fb765..ce3a08231 100755 --- a/bin/newexe +++ b/bin/newexe @@ -3,11 +3,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/newexe,v 1.7 2004/10/04 13:56:50 vapier Exp $ -if [ -z "${T}" ] || [ -z "${2}" ] ; then - echo "Nothing defined to do." +if [[ -z ${T} ]] || [[ -z ${2} ]] ; then + echo "$0: Need two arguments, old file and new file" 1>&2 exit 1 fi -rm -rf "${T}/${2}" -cp "${1}" "${T}/${2}" -doexe "${T}/${2}" +rm -rf "${T}/${2}" && \ +cp -f "${1}" "${T}/${2}" && \ +exec doexe "${T}/${2}" diff --git a/bin/newins b/bin/newins index 81ab5662d..8dcbd99c1 100755 --- a/bin/newins +++ b/bin/newins @@ -3,11 +3,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/newins,v 1.7 2004/10/04 13:56:50 vapier Exp $ -if [ -z "${T}" ] || [ -z "${2}" ] ; then - echo "Error: Nothing defined to do." +if [[ -z ${T} ]] || [[ -z ${2} ]] ; then + echo "$0: Need two arguments, old file and new file" 1>&2 exit 1 fi -rm -rf "${T}/${2}" -cp "${1}" "${T}/${2}" -doins "${T}/${2}" +rm -rf "${T}/${2}" && \ +cp -f "${1}" "${T}/${2}" && \ +exec doins "${T}/${2}" diff --git a/bin/newlib.a b/bin/newlib.a index 914eb49dc..0f9b45d9b 100755 --- a/bin/newlib.a +++ b/bin/newlib.a @@ -3,11 +3,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.a,v 1.7 2004/10/04 13:56:50 vapier Exp $ -if [ -z "${T}" ] || [ -z "${2}" ] ; then - echo "Error: Nothing defined to do." +if [[ -z ${T} ]] || [[ -z ${2} ]] ; then + echo "$0: Need two arguments, old file and new file" 1>&2 exit 1 fi -rm -rf "${T}/${2}" -cp "${1}" "${T}/${2}" -dolib.a "${T}/${2}" +rm -rf "${T}/${2}" && \ +cp -f "${1}" "${T}/${2}" && \ +exec dolib.a "${T}/${2}" diff --git a/bin/newlib.so b/bin/newlib.so index 6e0f7bd25..a756068ef 100755 --- a/bin/newlib.so +++ b/bin/newlib.so @@ -3,11 +3,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/newlib.so,v 1.7 2004/10/04 13:56:50 vapier Exp $ -if [ -z "${T}" ] || [ -z "${2}" ] ; then - echo "Error: Nothing defined to do." +if [[ -z ${T} ]] || [[ -z ${2} ]] ; then + echo "$0: Need two arguments, old file and new file" 1>&2 exit 1 fi -rm -rf "${T}/${2}" -cp "${1}" "${T}/${2}" -dolib.so "${T}/${2}" +rm -rf "${T}/${2}" && \ +cp -f "${1}" "${T}/${2}" && \ +exec dolib.so "${T}/${2}" diff --git a/bin/newman b/bin/newman index 14349a9d7..24a4757ec 100755 --- a/bin/newman +++ b/bin/newman @@ -3,11 +3,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/newman,v 1.7 2004/10/04 13:56:50 vapier Exp $ -if [ -z "${T}" ] || [ -z "${2}" ] ; then - echo "Nothing defined to do." +if [[ -z ${T} ]] || [[ -z ${2} ]] ; then + echo "$0: Need two arguments, old file and new file" 1>&2 exit 1 fi -rm -rf "${T}/${2}" -cp "${1}" "${T}/${2}" -doman "${T}/${2}" +rm -rf "${T}/${2}" && \ +cp -f "${1}" "${T}/${2}" && \ +exec doman "${T}/${2}" diff --git a/bin/newsbin b/bin/newsbin index a2413e444..ec043dbca 100755 --- a/bin/newsbin +++ b/bin/newsbin @@ -3,11 +3,11 @@ # Distributed under the terms of the GNU General Public License v2 # $Id: /var/cvsroot/gentoo-src/portage/bin/newsbin,v 1.7 2004/10/04 13:56:50 vapier Exp $ -if [ -z "${T}" ] || [ -z "${2}" ] ; then - echo "Nothing defined to do." +if [[ -z ${T} ]] || [[ -z ${2} ]] ; then + echo "$0: Need two arguments, old file and new file" 1>&2 exit 1 fi -rm -rf "${T}/${2}" -cp "${1}" "${T}/${2}" -dosbin "${T}/${2}" +rm -rf "${T}/${2}" && \ +cp -f "${1}" "${T}/${2}" && \ +exec dosbin "${T}/${2}" |