Skip to content

Commit 4a02969

Browse files
committed
Minor Updates
1 parent b0964cd commit 4a02969

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

scratch

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,13 @@ getportpath() {
8282
vercomp() {
8383
if [ "$1" = "$2" ]; then
8484
return 0 # same version
85-
elif [ "$1" = "$(echo "$1\n$2" | sort -V | head -n1)" ]; then
85+
#elif [ "$1" = "$(echo "$1\n$2" | sort -V | head -n1)" ]; then
86+
elif [ "$(printf '%s\n' "$1" "$2" | sort -V | head -n1)" = "$1" ]; then
8687
return 1 # $1 lower than $2
88+
#echo "1"
8789
else
8890
return 2 # $1 higher than $2
91+
#echo "2"
8992
fi
9093
}
9194

@@ -910,24 +913,26 @@ scratch_outdate() {
910913
if [ -f "$MASK_FILE" ] && [ $(grep -Ev '^(#|$| )' $MASK_FILE | grep $pkg) ]; then
911914
ITSLOCK="[masked]"
912915
fi
913-
outdatemsg="$name $iversion-$irelease => $version-$release $ITSLOCK"
914-
newerinstmsg="$name $iversion-$irelease => $version-$release [newer installed] $ITSLOCK"
916+
#outdatemsg="$name $iversion-$irelease => $version-$release $ITSLOCK"
917+
#newerinstmsg="$name $iversion-$irelease => $version-$release [newer installed] $ITSLOCK"
918+
outdatemsg="$name ${RED}$iversion-$irelease${CRESET} => ${GREEN}$version-$release${CRESET} ${CYAN}$ITSLOCK${CRESET}"
919+
newerinstmsg="$name ${RED}$iversion-$irelease${CRESET} => ${GREEN}$version-$release${CRESET} ${YELLOW}[newer installed]${CRESET} ${CYAN}$ITSLOCK${CRESET}"
915920
if [ "$version" != "$iversion" ]; then
916921
vercomp $version $iversion
917922
if [ $? = 2 ]; then
918-
echo "$outdatemsg"
923+
echo -e "$outdatemsg"
919924
OUTDATE=yes
920925
elif [ $? = 1 ]; then
921-
echo "$newerinstmsg"
926+
echo -e "$newerinstmsg"
922927
OUTDATE=yes
923928
fi
924929
elif [ "$release" != "$irelease" ]; then
925930
vercomp $release $irelease
926931
if [ $? = 2 ]; then
927-
echo "$outdatemsg"
932+
echo -e "$outdatemsg"
928933
OUTDATE=yes
929934
elif [ $? = 1 ]; then
930-
echo "$newerinstmsg"
935+
echo -e "$newerinstmsg"
931936
OUTDATE=yes
932937
fi
933938
fi

0 commit comments

Comments
 (0)