Let tseek find parent dir when top directory is not configured.

hyeshik · Dec 1, 2016 · 59a17bc · 59a17bc
1 parent ab11977
commit 59a17bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/install/configure.sh b/install/configure.sh
@@ -359,7 +359,8 @@ fi # -z TAILSEEKER_BINDIR
 
 rm -f $install_dir/tseek
 cat $TOPDIR/install/tailseeker.in | \
-sed -e "s,%%TAILSEEKER_DIR%%,$TOPDIR,g" > $install_dir/tseek
+sed -e "s,%%TAILSEEKER_DIR%%,$TOPDIR,g" -e "s,^##,,g" \
+  -e 's,^\(.*\)##$,# \1,g' > $install_dir/tseek
 script_mode=$(printf "%04o\n" $((0777 & ~$(umask))))
 chmod $script_mode $install_dir/tseek
 

diff --git a/install/tailseeker.in b/install/tailseeker.in
@@ -21,9 +21,11 @@
 # THE SOFTWARE.
 #
 
-TAILSEEKER_DIR = '%%TAILSEEKER_DIR%%'
+import sys, os
+
+TAILSEEKER_DIR = os.path.join(os.path.dirname(sys.argv[0]), '..') ##
+##TAILSEEKER_DIR = '%%TAILSEEKER_DIR%%'
 
-import sys
 sys.path.insert(0, TAILSEEKER_DIR)
 
 from tailseeker import tskcommand