diff options
| author |   Ali Polatel <hawking@gentoo.org> | 2008-08-25 09:32:30 +0000 |
|---|---|---|
| committer | Ali Polatel <hawking@gentoo.org> | 2008-08-25 09:32:30 +0000 |
| commit | 71c91d18fc2d52d78f64ea78bfcd385049107d45 (patch) | |
| tree | 24c62b3c30b41c170acd2f67ae9c0c3d8ef490c1 | |
| parent | Tell the user to use -o switch when no previous python versions are found, #2... (diff) | |
| download | python-updater-71c91d18fc2d52d78f64ea78bfcd385049107d45.tar.gz python-updater-71c91d18fc2d52d78f64ea78bfcd385049107d45.tar.bz2 python-updater-71c91d18fc2d52d78f64ea78bfcd385049107d45.zip | |
Use != instead of -ne
| -rwxr-xr-x | python-updater | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/python-updater b/python-updater index 8942b29..3b80fb4 100755 --- a/python-updater +++ b/python-updater @@ -262,7 +262,7 @@ PORTDIR="$(get_portage_portdir)" # Determine old python version if [[ -z "${OLD_PY_VER}" ]]; then OLD_PY_VER="$(get_old_pyver)" - if [[ $? -ne 0 ]]; then + if [[ $? != 0 ]]; then exit 1 fi fi @@ -273,7 +273,7 @@ PORTAGE_PYTHON="$(get_portage_python ${OLD_PY_VER} ${NEW_PY_VER})" einfo "Starting Python Updater from ${OLD_PY_VER} to ${NEW_PY_VER} :" -if [[ CHECK_SONAME -ne 0 ]]; then +if [[ CHECK_SONAME != 0 ]]; then if ! type -P scanelf >/dev/null 2>&1; then ewarn "scanelf not found!" ewarn "check soname is disabled." @@ -290,13 +290,13 @@ if [[ CHECK_SONAME -ne 0 ]]; then else veinfo 1 'check "soname" disabled.' fi -[[ CHECK_PYLIBDIR -ne 0 ]] \ +[[ CHECK_PYLIBDIR != 0 ]] \ && veinfo 1 'check "pylibdir" enabled.' \ || veinfo 1 'check "pylibdir" disabled.' -[[ CHECK_ECLASS -ne 0 ]] \ +[[ CHECK_ECLASS != 0 ]] \ && veinfo 1 'check "eclass" enabled.' \ || veinfo 1 'check "eclass" disabled.' -[[ CHECK_MANUAL -ne 0 ]] \ +[[ CHECK_MANUAL != 0 ]] \ && veinfo 1 'check "manual" enabled.' \ || veinfo 1 'check "manual" disabled.' @@ -320,7 +320,7 @@ for content in `find ${PKG_DBDIR} -name CONTENTS`; do [[ ${exception} == 1 ]] && continue # Check if package is in PKGS_MANUAL - if [[ CHECK_MANUAL -ne 0 ]]; then + if [[ CHECK_MANUAL != 0 ]]; then for pkg in ${PKGS_MANUAL}; do if [ -z "${CATPKG##${pkg}}" ]; then exception=2 @@ -331,7 +331,7 @@ for content in `find ${PKG_DBDIR} -name CONTENTS`; do # replace version number by SLOT if IGNORE_VERSIONS != 0 # Don't ignore versions when SLOT doesn't exist, bug 201848 - if [[ IGNORE_VERSIONS -ne 0 && -f "${content/CONTENTS/SLOT}" ]]; then + if [[ IGNORE_VERSIONS != 0 && -f "${content/CONTENTS/SLOT}" ]]; then SLOT=$(< ${content/CONTENTS/SLOT}) CATPKGVER="${CATPKG}:${SLOT}" else @@ -348,7 +348,7 @@ for content in `find ${PKG_DBDIR} -name CONTENTS`; do continue fi - if [[ CHECK_PYLIBDIR -ne 0 ]]; then + if [[ CHECK_PYLIBDIR != 0 ]]; then # Search for possible old python dirs in CONTENTS # /usr/include/python$old # /usr/lib/python$old @@ -365,7 +365,7 @@ for content in `find ${PKG_DBDIR} -name CONTENTS`; do fi fi - if [[ CHECK_SONAME -ne 0 ]]; then + if [[ CHECK_SONAME != 0 ]]; then broken_libs="$(scanelf -qBN ${OLD_SONAME} < <( grep -e '^obj' ${content} | cut -d' ' -f2))" if [[ -n "${broken_libs}" ]]; then @@ -380,7 +380,7 @@ for content in `find ${PKG_DBDIR} -name CONTENTS`; do fi fi - if [[ CHECK_ECLASS -ne 0 ]]; then + if [[ CHECK_ECLASS != 0 ]]; then ENVIRON="${content/CONTENTS/environment.bz2}" if bzip2 -dc ${ENVIRON} | grep -qe "^\(export \)\?PYVER=${OLD_PY_VER}"; then PKGS_TO_REMERGE="${PKGS_TO_REMERGE} ${CATPKGVER}" |