From 5bcd33019a6fbde35dcba74c7a52ebb8963d3a82 Mon Sep 17 00:00:00 2001
From: Daniel STAN <daniel.stan@crans.org>
Date: Sat, 27 Jul 2013 17:41:38 +0200
Subject: [PATCH] default EDITOR
---
cranspasswords.py | 2 +-
cranspasswords_bash_completion | 4 ----
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/cranspasswords.py b/cranspasswords.py
index c623880..de29629 100755
--- a/cranspasswords.py
+++ b/cranspasswords.py
@@ -285,7 +285,7 @@ def editor(texte, annotations=""):
for l in annotations.split('\n'):
f.write("# %s\n" % l.encode('utf-8'))
f.flush()
- proc = subprocess.Popen(os.getenv('EDITOR') + ' ' + f.name, shell=True)
+ proc = subprocess.Popen([os.getenv('EDITOR', '/usr/bin/editor'), f.name])
os.waitpid(proc.pid, 0)
f.seek(0)
ntexte = f.read()
diff --git a/cranspasswords_bash_completion b/cranspasswords_bash_completion
index 1a7ea62..d0712ac 100644
--- a/cranspasswords_bash_completion
+++ b/cranspasswords_bash_completion
@@ -1,9 +1,5 @@
# Fonction de notre auto completion
-if [[ "$EDITOR" = "" ]]; then
- export EDITOR="nano";
-fi
-
_cranspasswords(){
# declaration des variables locales
local argc first last prev cur cur_first_char opts_short opts role_dir pass_dir server server_list role_list pass_list timeout
--
GitLab