summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryce Harrington <bryce@bryceharrington.org>2016-01-22 13:38:09 -0800
committerBryce Harrington <bryce@bryceharrington.org>2016-01-22 13:38:09 -0800
commitb56a4c0766f2f58e2f777ee16fba40a5f35e861e (patch)
tree5574f5d1512147813b85032970b58b860394a794
parent94e27094e2d4b22ceed8d81b224452f9a812db05 (diff)
Load the config file from ~/.config/wayland-build-tools instead of ~/bin
-rwxr-xr-xwl_build2
-rwxr-xr-xwl_clone2
-rw-r--r--wl_defines.sh2
-rwxr-xr-xwl_install_deps2
-rwxr-xr-xwl_patch_check4
-rwxr-xr-xwl_update2
6 files changed, 7 insertions, 7 deletions
diff --git a/wl_build b/wl_build
index 112203e..66f1db4 100755
--- a/wl_build
+++ b/wl_build
@@ -1,6 +1,6 @@
#!/bin/bash
-. ~/bin/wl_defines.sh
+. $HOME/.config/wayland-build-tools/wl_defines.sh
if [ ! -e $WLROOT ]; then
exit 1
diff --git a/wl_clone b/wl_clone
index f6559b9..e31006e 100755
--- a/wl_clone
+++ b/wl_clone
@@ -1,6 +1,6 @@
#!/bin/bash
-. ~/bin/wl_defines.sh
+. $HOME/.config/wayland-build-tools/wl_defines.sh
# TODO: Check if tree already exists first
# TODO: Bail if errors
diff --git a/wl_defines.sh b/wl_defines.sh
index 915c621..eaa1853 100644
--- a/wl_defines.sh
+++ b/wl_defines.sh
@@ -1,5 +1,5 @@
export INCLUDE_XWAYLAND=1
-export WLROOT=$HOME/build/Wayland
+export WLROOT=$HOME/Wayland
export WLD=$WLROOT/install # change this to another location if you prefer
if [ "$(uname -i)" = "i386" ]; then
diff --git a/wl_install_deps b/wl_install_deps
index 53d4eac..c400f6f 100755
--- a/wl_install_deps
+++ b/wl_install_deps
@@ -1,6 +1,6 @@
#!/bin/bash
-. ~/bin/wl_defines.sh
+. $HOME/.config/wayland-build-tools/wl_defines.sh
# generic build dependencies for ubuntu
sudo apt-get -y install autoconf automake bison debhelper dpkg-dev flex
diff --git a/wl_patch_check b/wl_patch_check
index 6927c30..5c740b9 100755
--- a/wl_patch_check
+++ b/wl_patch_check
@@ -1,6 +1,6 @@
#!/bin/bash
-. ~/bin/wl_defines.sh
+. $HOME/.config/wayland-build-tools/wl_defines.sh
## == Code Review ==
## Is the code correct?
@@ -96,4 +96,4 @@ fi
#daily, and start really mass producing stats for myself.
#
# TODO: Avoid needing to rebuild everything if we're only patching weston
-# TODO: Separately cache each build so it's easier to test each \ No newline at end of file
+# TODO: Separately cache each build so it's easier to test each
diff --git a/wl_update b/wl_update
index c03433c..4bf3fa3 100755
--- a/wl_update
+++ b/wl_update
@@ -1,6 +1,6 @@
#!/bin/bash
-. ~/bin/wl_defines.sh
+. $HOME/.config/wayland-build-tools/wl_defines.sh
# TODO: Check if tree already exists first
# TODO: Bail if errors