summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorVlad Glagolev2012-10-19 19:22:01 +0400
committerVlad Glagolev2012-10-19 19:22:01 +0400
commit7b0dabf3b5e97f5786d00630babb8a69035b87c8 (patch)
tree88c655cf55669b1d76f5e95653f35ca37d3025e5
parentfefcc3d361d1c932348429eeb9bc7797dc4b77d9 (diff)
elvis: corrected symlink check
-rwxr-xr-xeditors/elvis/CONFIGURE5
-rw-r--r--editors/elvis/HISTORY3
2 files changed, 6 insertions, 2 deletions
diff --git a/editors/elvis/CONFIGURE b/editors/elvis/CONFIGURE
index 23d189e785..4cc297b17d 100755
--- a/editors/elvis/CONFIGURE
+++ b/editors/elvis/CONFIGURE
@@ -1,6 +1,7 @@
-config_query MAKE_SYMLINK "Would you like to have /usr/bin/vi as a symlink to /usr/bin/elvis?" n
+config_query MAKE_SYMLINK "Would you like to have /usr/bin/vi as a symlink to /usr/bin/elvis?" n &&
+
if [ "${MAKE_SYMLINK}" == "y" ] ; then
- if [ -e /usr/bin/vi ] ; then
+ if [ -e /usr/bin/vi ] && `readlink -f "/usr/bin/vi" | grep -viq "elvis"`; then
echo "VI is already provided by vim." &&
echo "To have elvis as provider of vi, recast vim with the vi symlink option disabled, then recast elvis." &&
MAKE_SYMLINK="n"
diff --git a/editors/elvis/HISTORY b/editors/elvis/HISTORY
index 3744c61c92..f214ecf8f1 100644
--- a/editors/elvis/HISTORY
+++ b/editors/elvis/HISTORY
@@ -1,3 +1,6 @@
+2012-10-19 Vlad Glagolev <stealth@sourcemage.org>
+ * CONFIGURE: corrected symlink check
+
2012-05-13 Vlad Glagolev <stealth@sourcemage.org>
* DETAILS: removed UPDATED; quoting paths
* DEPENDS: killed xorg-libs, see #14699 on old bug tracker; added