From 373f39ef750ba3485130af0c6df725613246b61b Mon Sep 17 00:00:00 2001
From: Damien Lallement <dams@mageia.org>
Date: Wed, 9 May 2012 13:05:56 +0000
Subject: rename 'xte' to fix upgrade conflict

---
 bin/editor | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 bin/xte    | 61 -------------------------------------------------------------
 2 files changed, 61 insertions(+), 61 deletions(-)
 create mode 100755 bin/editor
 delete mode 100755 bin/xte

(limited to 'bin')

diff --git a/bin/editor b/bin/editor
new file mode 100755
index 0000000..63a5f5c
--- /dev/null
+++ b/bin/editor
@@ -0,0 +1,61 @@
+#!/bin/sh
+#---------------------------------------------------------------
+# Project         : Mageia
+# Module          : bin
+# File            : xte
+# Author          : David Walser
+# Created On      : Thu Apr 3 16:26:54 2012
+# Purpose         : launch a text editor
+#---------------------------------------------------------------
+
+strip_texteditor_var() {
+    if [[ -n "$TEXTEDITOR" ]]; then
+	if [[ `basename "$TEXTEDITOR"` == "xte" ]]; then
+	    unset TEXTEDITOR
+	elif ! which $TEXTEDITOR > /dev/null 2>&1; then
+	    unset TEXTEDITOR
+	fi
+    fi
+}
+
+strip_texteditor_var
+if [[ -z "$TEXTEDITOR" ]]; then
+ 
+    # using GNOME
+    if [[ -n "$GNOME_DESKTOP_SESSION_ID" ]]; then
+	TEXTEDITOR="gedit"
+    fi
+
+    #using KDE
+    if [[ -n "$KDE_FULL_SESSION" ]]; then
+	TEXTEDITOR="kwrite"
+    fi
+
+
+    strip_texteditor_var
+    
+    [[ -z "$TEXTEDITOR" ]] && TEXTEDITOR=`which kwrite 2> /dev/null` 
+    [[ -z "$TEXTEDITOR" ]] && TEXTEDITOR=`which gedit 2> /dev/null` 
+    
+    if [[ -z "$TEXTEDITOR" ]]; then
+	EMACS=`/usr/sbin/update-alternatives --list emacs`
+	if [[ -n "$EMACS" ]]; then
+	    if [[ `basename "$EMACS"` = "emacs-nox" ]]; then
+		TEXTEDITOR="xvt -e emacs"
+	    else
+		TEXTEDITOR="emacs"
+	    fi
+	fi
+    fi
+    
+    [[ -z "$TEXTEDITOR" ]] && which vim > /dev/null 2>&1 && TEXTEDITOR="xvt -e vim"
+    [[ -z "$TEXTEDITOR" ]] && which nano > /dev/null 2>&1 && TEXTEDITOR="xvt -e nano"
+fi
+
+if [[ -n "$TEXTEDITOR" ]]; then 
+    exec $TEXTEDITOR $@
+else
+    echo "no text editor detected"
+fi
+
+# xte ends here
diff --git a/bin/xte b/bin/xte
deleted file mode 100755
index 63a5f5c..0000000
--- a/bin/xte
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-#---------------------------------------------------------------
-# Project         : Mageia
-# Module          : bin
-# File            : xte
-# Author          : David Walser
-# Created On      : Thu Apr 3 16:26:54 2012
-# Purpose         : launch a text editor
-#---------------------------------------------------------------
-
-strip_texteditor_var() {
-    if [[ -n "$TEXTEDITOR" ]]; then
-	if [[ `basename "$TEXTEDITOR"` == "xte" ]]; then
-	    unset TEXTEDITOR
-	elif ! which $TEXTEDITOR > /dev/null 2>&1; then
-	    unset TEXTEDITOR
-	fi
-    fi
-}
-
-strip_texteditor_var
-if [[ -z "$TEXTEDITOR" ]]; then
- 
-    # using GNOME
-    if [[ -n "$GNOME_DESKTOP_SESSION_ID" ]]; then
-	TEXTEDITOR="gedit"
-    fi
-
-    #using KDE
-    if [[ -n "$KDE_FULL_SESSION" ]]; then
-	TEXTEDITOR="kwrite"
-    fi
-
-
-    strip_texteditor_var
-    
-    [[ -z "$TEXTEDITOR" ]] && TEXTEDITOR=`which kwrite 2> /dev/null` 
-    [[ -z "$TEXTEDITOR" ]] && TEXTEDITOR=`which gedit 2> /dev/null` 
-    
-    if [[ -z "$TEXTEDITOR" ]]; then
-	EMACS=`/usr/sbin/update-alternatives --list emacs`
-	if [[ -n "$EMACS" ]]; then
-	    if [[ `basename "$EMACS"` = "emacs-nox" ]]; then
-		TEXTEDITOR="xvt -e emacs"
-	    else
-		TEXTEDITOR="emacs"
-	    fi
-	fi
-    fi
-    
-    [[ -z "$TEXTEDITOR" ]] && which vim > /dev/null 2>&1 && TEXTEDITOR="xvt -e vim"
-    [[ -z "$TEXTEDITOR" ]] && which nano > /dev/null 2>&1 && TEXTEDITOR="xvt -e nano"
-fi
-
-if [[ -n "$TEXTEDITOR" ]]; then 
-    exec $TEXTEDITOR $@
-else
-    echo "no text editor detected"
-fi
-
-# xte ends here
-- 
cgit v1.2.1