diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-01-03 02:16:44 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-01-03 02:16:44 -0500 |
| commit | 52cc0c3ff27d4c48d3461d9fd898367aa4a92631 (patch) | |
| tree | f4d2b4fcfbc1c6cda116b7723ebe2eee774b0cd6 /src/libretools.conf | |
| parent | 3793e4fac9d1d853251e84838caa2b8849d1f32b (diff) | |
| parent | 58e2a9cd5aa9a4eb80f8da675685f62aca128eb3 (diff) | |
Merge branch 'master' into xbs
Conflicts:
src/lib/conf.sh
Diffstat (limited to 'src/libretools.conf')
| -rw-r--r-- | src/libretools.conf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libretools.conf b/src/libretools.conf index 50ded8b..ff989f0 100644 --- a/src/libretools.conf +++ b/src/libretools.conf @@ -5,14 +5,14 @@ ################################################################################ # The dir where you work on -WORKDIR=/home/$LIBREUSER/packages +WORKDIR="$LIBREHOME/packages" ## Blacklist URL BLACKLIST=https://repo.parabolagnulinux.org/docs/blacklist.txt ## Diff tool (vimdiff, gvimdiff, meld, etc) ## Used by `aur`, `diff-unfree` -DIFFTOOL=`which kdiff3 meld gvimdiff vimdiff colordiff diff 2>/dev/null|sed 's/\s.*//;1q'` +DIFFPROG=`which kdiff3 meld gvimdiff vimdiff colordiff diff 2>/dev/null|sed 's/\s.*//;1q'` ## The repos you'll be packaging for ## Used by `toru`, `createworkdir` @@ -28,7 +28,7 @@ ARCHES=('x86_64' 'i686' 'mips64el') ## ABSLibre ## Used by `createworkdir` -ABSLIBREREGV=git://projects.parabolagnulinux.org/abslibre.git +ABSLIBRERECV=git://projects.parabolagnulinux.org/abslibre.git ABSLIBRESEND=ssh://git@projects.parabolagnulinux.org:1863/srv/git/abslibre.git ################################################################################ |