Permalink
Browse files

fix local/install

  • Loading branch information...
1 parent 61bd2e1 commit 82d5c762c0e5bb537b736e8a1dd7e06ebc3d2607 @mpapis mpapis committed Aug 7, 2011
Showing with 20 additions and 15 deletions.
  1. +18 −0 install
  2. +2 −15 local
View
@@ -1,3 +1,21 @@
#!/usr/bin/env bash
+# The default prefix is /usr/local,
+# this should be set to where BDSM is installed to in /etc/bdsmrc
+
+if [[ -z "${bdsm_path}" ]]
+then
+ if (( UID == 0 ))
+ then
+ bdsm_path="/usr/local/bdsm"
+ else
+ bdsm_path="$HOME/.bdsm"
+ fi
+fi
+
+# set BDSM basic paths
+install_path="${bdsm_path}" # Path to install everything to
+archives_path="${bdsm_path}/archives"
+scm_path="${bdsm_path}/scm"
+
./local --call=install/install_bdsm
View
@@ -19,21 +19,8 @@
# record this early on.
initial_pwd="$PWD"
-# The default prefix is /usr/local,
-# this should be set to where BDSM is installed to in /etc/bdsmrc
-if [[ -z "${bdsm_path}" ]]
-then
- if (( UID == 0 ))
- then
- bdsm_path="/usr/local/bdsm"
- else
- bdsm_path="$HOME/.bdsm"
- fi
-fi
-
-# set BDSM basic paths
-install_path="${bdsm_path}" # Path to install everything to
-bdsm_path="$PWD" # Path to load everything from
+# Path to load everything from
+bdsm_path="$PWD"
modules_path="${bdsm_path}/extensions/builtin/core/modules"
export initial_pwd bdsm_path modules_path

0 comments on commit 82d5c76

Please sign in to comment.