gentoo/dev-util/visual-regexp/files/visual-regexp-3.0-home-conf-fix.patch
Robin H. Johnson 56bd759df1
proj/gentoo: Initial commit
This commit represents a new era for Gentoo:
Storing the gentoo-x86 tree in Git, as converted from CVS.

This commit is the start of the NEW history.
Any historical data is intended to be grafted onto this point.

Creation process:
1. Take final CVS checkout snapshot
2. Remove ALL ChangeLog* files
3. Transform all Manifests to thin
4. Remove empty Manifests
5. Convert all stale $Header$/$Id$ CVS keywords to non-expanded Git $Id$
5.1. Do not touch files with -kb/-ko keyword flags.

Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
X-Thanks: Alec Warner <antarus@gentoo.org> - did the GSoC 2006 migration tests
X-Thanks: Robin H. Johnson <robbat2@gentoo.org> - infra guy, herding this project
X-Thanks: Nguyen Thai Ngoc Duy <pclouds@gentoo.org> - Former Gentoo developer, wrote Git features for the migration
X-Thanks: Brian Harring <ferringb@gentoo.org> - wrote much python to improve cvs2svn
X-Thanks: Rich Freeman <rich0@gentoo.org> - validation scripts
X-Thanks: Patrick Lauer <patrick@gentoo.org> - Gentoo dev, running new 2014 work in migration
X-Thanks: Michał Górny <mgorny@gentoo.org> - scripts, QA, nagging
X-Thanks: All of other Gentoo developers - many ideas and lots of paint on the bikeshed
2015-08-08 17:38:18 -07:00

57 lines
1.8 KiB
Diff

diff -ur a/visual_regexp.tcl b/visual_regexp.tcl
--- a/visual_regexp.tcl 2013-11-12 23:23:59.730171882 +0100
+++ b/visual_regexp.tcl 2013-11-12 23:24:42.134085257 +0100
@@ -1062,27 +1060,38 @@
#==============================================================================================
# try to get customization from 'visual_regexp.ini'
-puts "[file exists visual_regexp.ini]"
-set filename [file dirname [info nameofexecutable]]/visual_regexp.ini
-if {[file exists $filename]} {
- source $filename
-} elseif {[file exists visual_regexp.ini]} {
- source visual_regexp.ini
+set localfilename visual_regexp.ini
+set homefilename ""
+if {[info exists ::env(HOME)]} {
+ set homefilename [file join $::env(HOME) .visual_regexp visual_regexp.ini]
}
-
-# try to auto user patterns
-set filename [file dirname [info nameofexecutable]]/regexp.txt
-if {[file exists $filename]} {
- regexp::pattern:load $filename
-} elseif {[file exists regexp.txt]} {
- regexp::pattern:load regexp.txt
+set binfilename [file join [file dirname [info nameofexecutable]] visual_regexp.ini]
+foreach filename [list $localfilename $homefilename $binfilename] {
+ if {[file exists $filename]} {
+ source $filename
+ break
+ }
}
-# buld the GUI
+# build the GUI
regexp::history:init
regexp::gui
regexp::go
+# try to auto user patterns
+set localfilename regexp.txt
+set homefilename ""
+if {[info exists ::env(HOME)]} {
+ set homefilename [file join $::env(HOME) .visual_regexp regexp.txt]
+}
+set binfilename [file join [file dirname [info nameofexecutable]] regexp.txt]
+foreach filename [list $localfilename $homefilename $binfilename] {
+ if {[file exists $filename]} {
+ regexp::pattern:load $filename
+ break
+ }
+}
+
if {$argc > 1} {
puts "Usage: $argv0 <sampleFile>"
} elseif {$argc == 1} {