# HG changeset patch # User Pascal Bellard # Date 1551180439 -3600 # Node ID a0bdc170c51e3bdda02b18525846ba4ea13f9ebd # Parent c6b5c649a7a3e2a2ded159224c0a3d4d23888861 Remove ashism == diff -r c6b5c649a7a3 -r a0bdc170c51e lib/libspk.sh --- a/lib/libspk.sh Thu Feb 16 19:22:27 2017 +0100 +++ b/lib/libspk.sh Tue Feb 26 12:27:19 2019 +0100 @@ -185,7 +185,7 @@ return 0 else [ "$verbose" ] && echo "URL: $uri/" - if [ "$db" == "$PKGS_DB" ]; then + if [ "$db" = "$PKGS_DB" ]; then gettext "Using official mirror:" else gettext "Using extra mirror:" diff -r c6b5c649a7a3 -r a0bdc170c51e spk --- a/spk Thu Feb 16 19:22:27 2017 +0100 +++ b/spk Tue Feb 26 12:27:19 2019 +0100 @@ -122,7 +122,7 @@ package_full=$(full_package $pkg) mirrored_pkg $pkg [ "$mirrored" ] || continue - [ "$count" == 0 ] && newline + [ "$count" = 0 ] && newline count=$(($count + 1)) download $package_full $mirror unset_mirrored @@ -168,7 +168,7 @@ # Display package's log if [ -f "$logdir/$pkg/install.log" ]; then count=$(($count + 1)) - [ "$count" == "1" ] && newline + [ "$count" = "1" ] && newline colorize 36 $(gettext "Install log for:"; echo " $pkg") separator cat $logdir/$pkg/install.log @@ -194,7 +194,7 @@ continue ;; esac count=$(($count + 1)) - [ "$count" == 1 ] && newline + [ "$count" = 1 ] && newline unset_receipt source_receipt $installed/$pkg/receipt boldify $(gettext "Package") $pkg @@ -215,7 +215,7 @@ continue ;; esac count=$(($count + 1)) - [ "$count" == 1 ] && newline + [ "$count" = 1 ] && newline boldify $(gettext "Package") $pkg separator gettext "Status :"; colorize 31 " not installed" diff -r c6b5c649a7a3 -r a0bdc170c51e spk-add --- a/spk-add Thu Feb 16 19:22:27 2017 +0100 +++ b/spk-add Tue Feb 26 12:27:19 2019 +0100 @@ -164,9 +164,9 @@ local count=0 for pkg_file in $list; do local name=$(basename $(dirname $pkg_file)) - [ "$package_name" == "$name" ] && continue 2 + [ "$package_name" = "$name" ] && continue 2 count=$(($count +1)) - [ "$count" == "1" ] && gettext "Modified package:"; \ + [ "$count" = "1" ] && gettext "Modified package:"; \ colorize 31 " $name" gettext "Overwriting file:"; echo " $file" # If confirm is set, ask to remove. Do we want that ? @@ -275,7 +275,7 @@ local package_file="$1" #check_valid_tazpkg $package_file if [ -f "$package_file" ]; then - if [ $(dirname $package_file) == "." ]; then + if [ $(dirname $package_file) = "." ]; then package_file=$(pwd)/$package_file fi debug "package file: $package_file" @@ -289,7 +289,7 @@ extract_receipt $tmpdir $package_file source $tmpdir/receipt [ "$forced" ] || check_installed $PACKAGE - [ "$count" == "1" ] && newline + [ "$count" = "1" ] && newline install_package $package_file update_databases } @@ -323,7 +323,7 @@ esac # Lets fetch the package by download() - [ "$count" == 1 ] && newline + [ "$count" = 1 ] && newline debug "spk-add package: $package_name" download "$package_full" $mirror cd $CACHE_DIR diff -r c6b5c649a7a3 -r a0bdc170c51e spk-convert --- a/spk-convert Thu Feb 16 19:22:27 2017 +0100 +++ b/spk-convert Tue Feb 26 12:27:19 2019 +0100 @@ -465,7 +465,7 @@ for pkg in $@ do - if [ "$(dd if=$pkg bs=8 count=1 skip=1 2> /dev/null)" == "debian-b" ]; + if [ "$(dd if=$pkg bs=8 count=1 skip=1 2> /dev/null)" = "debian-b" ]; then convert_deb $pkg else diff -r c6b5c649a7a3 -r a0bdc170c51e spk-ls --- a/spk-ls Thu Feb 16 19:22:27 2017 +0100 +++ b/spk-ls Tue Feb 26 12:27:19 2019 +0100 @@ -109,7 +109,7 @@ [ -f "$installed/$pkg/files.list" ] || continue nb=$(cat $installed/$pkg/files.list | wc -l) count=$(($count + 1)) - [ "$count" == 1 ] && newline + [ "$count" = 1 ] && newline # List modifiers if [ "$modifiers" ]; then modifiers=$installed/$pkg/modifiers diff -r c6b5c649a7a3 -r a0bdc170c51e spk-mirror --- a/spk-mirror Thu Feb 16 19:22:27 2017 +0100 +++ b/spk-mirror Tue Feb 26 12:27:19 2019 +0100 @@ -161,7 +161,7 @@ [ -d "$url" ] && url="dir:$url" case "$url" in http://*|ftp://|local) - [ "$count" == 0 ] && newline + [ "$count" = 0 ] && newline count=$(($count + 1)) url="${url%/}/" debug "checking: $url" @@ -215,7 +215,7 @@ pkgsdir=${dir%/} debug "dir: $dir" nb=$(ls $pkgsdir/*.tazpkg 2>/dev/null | wc -l) - if [ "$nb" == 0 ]; then + if [ "$nb" = 0 ]; then gettext "No packages found in:"; boldify " $pkgsdir" continue fi @@ -284,7 +284,7 @@ fi ;; --*) continue ;; *) - [ "$count" == 0 ] && newline + [ "$count" = 0 ] && newline count=$(($count + 1)) # Should we handle --rm also here ? if [ -d "$extradb/$url" ]; then diff -r c6b5c649a7a3 -r a0bdc170c51e spk-rm --- a/spk-rm Thu Feb 16 19:22:27 2017 +0100 +++ b/spk-rm Tue Feb 26 12:27:19 2019 +0100 @@ -149,7 +149,7 @@ continue fi count=$(($count + 1)) - [ "$count" == 1 ] && newline + [ "$count" = 1 ] && newline remove log "Removed package: $pkg" done diff -r c6b5c649a7a3 -r a0bdc170c51e spk-up --- a/spk-up Thu Feb 16 19:22:27 2017 +0100 +++ b/spk-up Tue Feb 26 12:27:19 2019 +0100 @@ -53,7 +53,7 @@ local check="$extradb/*/mirror $PKGS_DB/mirror" if [ "$mirror" ]; then check=$extradb/$mirror/mirror - [ "$mirror" == "main" ] && check=$PKGS_DB/mirror + [ "$mirror" = "main" ] && check=$PKGS_DB/mirror fi for mirror in $check; do [ -f "$mirror" ] || continue @@ -63,7 +63,7 @@ name=$(basename $(dirname $mirror)) url=$(cat $mirror) lists="packages.list packages.md5 packages.desc packages.equiv files.list.lzma" - [ "$(dirname $mirror)" == "$PKGS_DB" ] && name="main" + [ "$(dirname $mirror)" = "$PKGS_DB" ] && name="main" [ "$quiet" ] && quiet="-q" gettext "Checking mirror:"; colorize 34 " $name" @@ -75,7 +75,7 @@ wget -q ${url%/}/ID debug "ID: $(cat ID)" debug "ID.bak: $(cat ID.bak)" - if [ $(cat ID) == $(cat ID.bak) ] && [ ! "$forced" ]; then + if [ $(cat ID) = $(cat ID.bak) ] && [ ! "$forced" ]; then gettext "Mirror is up-to-date"; newline continue fi @@ -120,7 +120,7 @@ new=$(grep "^$PACKAGE |" $dbdesc | awk '{print $3}') - if [ "$VERSION" == "$new" ]; then + if [ "$VERSION" = "$new" ]; then build_count=$(($build_count + 1)) echo -n $(colorize 34 $(indent 48 $(gettext "New build"))) else @@ -200,7 +200,7 @@ pkg="$arg" system=no check_root - [ "$count" == 0 ] && up_headers + [ "$count" = 0 ] && up_headers if is_package_installed $pkg; then count=$(($count +1)) cd $installed @@ -252,7 +252,7 @@ pkgs=$(ls | wc -l) time=$(($(date +%s) - $time)) -if [ "$upnb" == 0 ] && [ "$blocked_count" == 0 ]; then +if [ "$upnb" = 0 ] && [ "$blocked_count" = 0 ]; then gettext "System is up-to-date..."; newline fi separator