From 17b4fb8b1636d2b0ca48859a06e04da053ac6100 Mon Sep 17 00:00:00 2001 From: Dmitry Marakasov Date: Fri, 11 Nov 2016 19:40:49 +0000 Subject: - Fix LICENSE - Add LICENSE_FILE - Add NO_ARCH - Switch to options helpers - Add simple test - Fix FreeBSD detection - Fix screenfetch failures in some cases due to not clearly understood reason: /usr/local/bin/screenfetch: line 4156: /dev/fd/62: Operation not supported /usr/local/bin/screenfetch: line 4157: 3: Bad file descriptor by importing upstream fix. PR: 213854 Submitted by: amdmi3 Approved by: jgh (maintainer) --- sysutils/screenfetch/files/patch-screenfetch-dev | 33 ++++++++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 sysutils/screenfetch/files/patch-screenfetch-dev (limited to 'sysutils/screenfetch/files/patch-screenfetch-dev') diff --git a/sysutils/screenfetch/files/patch-screenfetch-dev b/sysutils/screenfetch/files/patch-screenfetch-dev new file mode 100644 index 000000000000..da70f6bfc9e7 --- /dev/null +++ b/sysutils/screenfetch/files/patch-screenfetch-dev @@ -0,0 +1,33 @@ +--- screenfetch-dev.orig 2015-07-14 12:32:02 UTC ++++ screenfetch-dev +@@ -515,6 +515,14 @@ detectdistro () { + if [ "$distro" == "Unknown" ]; then + if [ $(uname -o 2>/dev/null) ]; then + case "$(uname -o)" in ++ "FreeBSD") ++ distro="FreeBSD" ++ fake_distro="${distro}" ++ ;; ++ "DragonFly") ++ distro="DragonFlyBSD" ++ fake_distro="${distro}" ++ ;; + "Cygwin") + distro="Cygwin" + fake_distro="${distro}" +@@ -4151,11 +4159,10 @@ for i in "${display[@]}"; do + ! [[ $Win_theme ]] && detectwmtheme; + else + if [[ "${display[*]}" =~ "$i" ]]; then +- if [[ "$errorSuppress" == "1" ]]; then detect${i} 2>/dev/null +- else +- exec 3> >(stderrOut) +- detect${i} 2>&3 +- exec 3>&- ++ if [[ "$errorSuppress" == "1" ]]; then ++ detect${i} 2>/dev/null ++ else ++ detect${i} + fi + fi + fi -- cgit v1.2.3