fff: bump to 2.0. (#3592)

This commit is contained in:
Crestwave
2019-02-02 18:23:48 +00:00
committed by waddlesplash
parent b654bba2d0
commit 5afdc93533
2 changed files with 36 additions and 1 deletions

View File

@@ -11,7 +11,7 @@ COPYRIGHT="2016-2018 Dylan Araps"
LICENSE="MIT"
REVISION="1"
SOURCE_URI="$HOMEPAGE/archive/$portVersion.tar.gz"
CHECKSUM_SHA256="83c149230b18c0ac0b4ec07824312c3df6c51f23eba8f1e22241c5ea96f4b078"
CHECKSUM_SHA256="dd953a81964ff4944841ba8bc47fecdae0f35e26b54002fcc73aedc35e57b2e2"
SOURCE_FILENAME="fff-$portVersion.tar.gz"
ARCHITECTURES="any"

View File

@@ -0,0 +1,35 @@
--- a/fff 2019-01-28 21:36:41.029622272 +0000
+++ b/fff 2019-01-30 08:43:58.977797120 +0000
@@ -14,6 +14,11 @@
haiku)
opener="open"
+
+ [[ -z $FFF_TRASH_CMD ]] && {
+ FFF_TRASH_CMD="trash"
+ FFF_TRASH="$(finddir -v "$PWD" B_TRASH_DIRECTORY)"
+ }
;;
esac
}
@@ -376,8 +381,9 @@
if [[ $FFF_TRASH_CMD ]]; then
# Pass all but the last argument to the user's
- # custom script.
- "$FFF_TRASH_CMD" "${@:1:$#-1}"
+ # custom script. command is used to prevent this function
+ # from conflicting with commands named "trash".
+ command "$FFF_TRASH_CMD" "${@:1:$#-1}"
else
cd "$FFF_TRASH" && mv -f "$@"
@@ -849,6 +855,8 @@
# Go to trash.
"${FFF_KEY_GO_TRASH:=t}")
+ [[ $OSTYPE == haiku && $FFF_TRASH_CMD == trash ]] &&
+ FFF_TRASH="$(finddir -v "$PWD" B_TRASH_DIRECTORY)"
open "$FFF_TRASH"
;;