Attachment 14512 Details for Bug 33136 – patch to fix read-in path

[patch] patch to fix read-in path

tuncel-2.1-fix-Open_a_shell.patch (text/plain), 1.62 KB, created by Aurelian R on 2024-04-23 19:13:11 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Aurelian R

Created: 2024-04-23 19:13:11 CEST

Size: 1.62 KB

patch

obsolete

>diff -Nurp tuncel-2.1/tuncel.in tuncel-2.1_new/tuncel.in
>--- tuncel-2.1/tuncel.in	2021-05-10 01:16:30.000000000 +0300
>+++ tuncel-2.1_new/tuncel.in	2024-04-23 18:04:46.626870930 +0300
>@@ -125,19 +125,21 @@ LICENSE=$(gettext "License")
> #########################################################################################
> #make file tests
> #########################################################################################
>-if [ ! -f "$2" ] ; then
>-  $DIALOG_ERROR "$(gettext "no file") $2"
>-  exit 1
>-fi
>+if [ ! -d "$2" ] ; then
>+  if [ ! -f "$2" ] ; then
>+    $DIALOG_ERROR "$(gettext "no file") $2"
>+    exit 1
>+  fi
> 
> ## @modified 2009/02/08
> ## @short Make compatible with file >= 0.5.0
>-test -n "$(file -iL "$2" | grep -e '\bapplication\/x\-rpm\b')" || {
>-  $DIALOG_ERROR "$(gettext "This file is not an application/x-rpm file!")"
>-  exit 1
>-}
>+  test -n "$(file -iL "$2" | grep -e '\bapplication\/x\-rpm\b')" || {
>+    $DIALOG_ERROR "$(gettext "This file is not an application/x-rpm file!")"
>+    exit 1
>+  }
> 
>-TMPF=$TMP_DIR/$($MD5SUM_BIN $2 | awk '{ print $1 }')
>+  TMPF=$TMP_DIR/$($MD5SUM_BIN $2 | awk '{ print $1 }')
>+fi
> 
> #########################################################################################
> # rpm unpacking function:
>@@ -206,9 +208,9 @@ case "$1" in
>     fi
>   ;;
>   terminal)
>-    if test -d "$1" && test -n "$TERMINAL_APPLICATION" || critical "$TERMINAL_APPLICATION"; then
>+    if test -d "$2" && test -n "$TERMINAL_APPLICATION" || critical "$TERMINAL_APPLICATION"; then
>       TERMINAL_CMD="$TERMINAL_APPLICATION $TERMINAL_OPTS"        
>-      $TERMINAL_CMD $1
>+      $TERMINAL_CMD $2
>     fi
>   ;;
>   *)

diff -Nurp tuncel-2.1/tuncel.in tuncel-2.1_new/tuncel.in
--- tuncel-2.1/tuncel.in	2021-05-10 01:16:30.000000000 +0300
+++ tuncel-2.1_new/tuncel.in	2024-04-23 18:04:46.626870930 +0300
@@ -125,19 +125,21 @@ LICENSE=$(gettext "License")
 #########################################################################################
 #make file tests
 #########################################################################################
-if [ ! -f "$2" ] ; then
-  $DIALOG_ERROR "$(gettext "no file") $2"
-  exit 1
-fi
+if [ ! -d "$2" ] ; then
+  if [ ! -f "$2" ] ; then
+    $DIALOG_ERROR "$(gettext "no file") $2"
+    exit 1
+  fi
 
 ## @modified 2009/02/08
 ## @short Make compatible with file >= 0.5.0
-test -n "$(file -iL "$2" | grep -e '\bapplication\/x\-rpm\b')" || {
-  $DIALOG_ERROR "$(gettext "This file is not an application/x-rpm file!")"
-  exit 1
-}
+  test -n "$(file -iL "$2" | grep -e '\bapplication\/x\-rpm\b')" || {
+    $DIALOG_ERROR "$(gettext "This file is not an application/x-rpm file!")"
+    exit 1
+  }
 
-TMPF=$TMP_DIR/$($MD5SUM_BIN $2 | awk '{ print $1 }')
+  TMPF=$TMP_DIR/$($MD5SUM_BIN $2 | awk '{ print $1 }')
+fi
 
 #########################################################################################
 # rpm unpacking function:
@@ -206,9 +208,9 @@ case "$1" in
     fi
   ;;
   terminal)
-    if test -d "$1" && test -n "$TERMINAL_APPLICATION" || critical "$TERMINAL_APPLICATION"; then
+    if test -d "$2" && test -n "$TERMINAL_APPLICATION" || critical "$TERMINAL_APPLICATION"; then
       TERMINAL_CMD="$TERMINAL_APPLICATION $TERMINAL_OPTS"        
-      $TERMINAL_CMD $1
+      $TERMINAL_CMD $2
     fi
   ;;
   *)

Actions: View | Diff

Attachments on bug 33136: 14512