From: Sven Eden <yamakuzure@gmx.net>
Date: Fri, 9 Mar 2018 17:41:25 +0000 (+0100)
Subject: pwx tools: Make location agnostic.
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e360129b99e4070566cd6d63fe4187518f9b7881;p=elogind.git

pwx tools: Make location agnostic.
---

diff --git a/pwx/pwx_git_applier.sh b/pwx/pwx_git_applier.sh
index a58f52120..62c4b1cea 100755
--- a/pwx/pwx_git_applier.sh
+++ b/pwx/pwx_git_applier.sh
@@ -40,14 +40,15 @@
 #                                        letting the user have a look.
 
 # Common functions
-source pwx_git_funcs.sh
+PROGDIR="$(readlink -f $(dirname $0))"
+source ${PROGDIR}/pwx_git_funcs.sh
 
 # Version, please keep this current
 VERSION="0.5.0"
 
 
 # Global values to be filled in:
-PATCH_DIR="${HERE}/patches"
+PATCH_DIR="${PROGDIR}/patches"
 TAG_TO_USE=""
 
 
diff --git a/pwx/pwx_git_funcs.sh b/pwx/pwx_git_funcs.sh
index 6656a46fb..30bcebe69 100644
--- a/pwx/pwx_git_funcs.sh
+++ b/pwx/pwx_git_funcs.sh
@@ -66,7 +66,7 @@ declare HERE="$(pwd -P)"
 # @VARIABLE: PWX_COMMIT_FILE
 # @DESCRIPTION
 # The name of the file that stores mutual commit information.
-declare PWX_COMMIT_FILE="pwx_last_mutual_commits.txt"
+declare PWX_COMMIT_FILE="${PROGDIR}/pwx_last_mutual_commits.txt"
 
 
 # @VARIABLE: PWX_IS_PUSHD
diff --git a/pwx/pwx_git_getter.sh b/pwx/pwx_git_getter.sh
index 2e4bbcffa..183cb1259 100755
--- a/pwx/pwx_git_getter.sh
+++ b/pwx/pwx_git_getter.sh
@@ -46,7 +46,8 @@
 #                                         file list.
 
 # Common functions
-source pwx_git_funcs.sh
+PROGDIR="$(readlink -f $(dirname $0))"
+source ${PROGDIR}/pwx_git_funcs.sh
 
 # Version, please keep this current
 VERSION="0.4.0"
@@ -55,7 +56,7 @@ VERSION="0.4.0"
 SOURCE_TREE=""
 TAG_TO_USE=""
 LAST_MUTUAL_COMMIT=""
-OUTPUT="${HERE}/patches"
+OUTPUT="${PROGDIR}/patches"
 EXTRA_GIT_OPTS=""
 
 
diff --git a/pwx/pwx_last_mutual_commits.txt b/pwx/pwx_last_mutual_commits.txt
index 70810f6b6..418e1ba27 100644
--- a/pwx/pwx_last_mutual_commits.txt
+++ b/pwx/pwx_last_mutual_commits.txt
@@ -7,3 +7,5 @@ v232-stable 79a5d862a7abe903f456a75d6d1ca3c11adfa379
 v233-stable 589fa9087a49e4250099bb6a4cf00358379fa3a4
 master 265710c2055254a98ed6dcd6aa172ca509a33553
 master-last efaa3176ad0e763a0fafd4519d4391813a88ba0e
+v236 83fefc8888620ce27ba39d906bd879bbcb6bc84e
+v236-last f78a88beca362e62ca242499950a097fbcdb10d2