summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2014-06-30 10:48:47 -0400
committerLuke Shumaker <lukeshu@sbcglobal.net>2014-06-30 10:48:47 -0400
commit0453b075c73817f7c05de14894ec78f3d6356c81 (patch)
tree6b0b9f624ff650fd0f463a6d8657b4fa048a0d7e
parent7f6458d67fa9e7f67e18e97ac61d5575dd1ccb21 (diff)
parent6cecf38dee88116feffd0d8a292df0e79de4184a (diff)
Merge branch 'clean'
-rwxr-xr-xbin/autoindent2
-rwxr-xr-xbin/devel/generate (renamed from generate.sh)5
2 files changed, 4 insertions, 3 deletions
diff --git a/bin/autoindent b/bin/autoindent
index c45da1e..52c61c6 100755
--- a/bin/autoindent
+++ b/bin/autoindent
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
file=$1
sed -i 's/^\s*//' "$file"
emacs --batch "$file" \
diff --git a/generate.sh b/bin/devel/generate
index 3a9d738..d71b454 100755
--- a/generate.sh
+++ b/bin/devel/generate
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
# The generate.sh bash file is used to generate all of the necessary
# .rb files to run the website
@@ -23,7 +23,8 @@
set -xe
# figure out where we are running from
-srcdir=$(dirname "$(readlink -f "$0")")
+srcdir="$(dirname "$(dirname "$(dirname "$(readlink -f "$0")")")")"
+# srcdir / bin / devel / generate
cd "$srcdir"
export RAILS_ENV=development