Skip to content
This repository
Browse code

fix local/install

  • Loading branch information...
commit 82d5c762c0e5bb537b736e8a1dd7e06ebc3d2607 1 parent 61bd2e1
Michal Papis authored

Showing 2 changed files with 20 additions and 15 deletions. Show diff stats Hide diff stats

  1. 18  install
  2. 17  local
18  install
... ...
@@ -1,3 +1,21 @@
1 1
 #!/usr/bin/env bash
2 2
 
  3
+# The default prefix is /usr/local,
  4
+# this should be set to where BDSM is installed to in /etc/bdsmrc
  5
+
  6
+if [[ -z "${bdsm_path}" ]]
  7
+then
  8
+  if (( UID == 0 ))
  9
+  then
  10
+    bdsm_path="/usr/local/bdsm"
  11
+  else
  12
+    bdsm_path="$HOME/.bdsm"
  13
+  fi
  14
+fi
  15
+
  16
+# set BDSM basic paths
  17
+install_path="${bdsm_path}" # Path to install everything to
  18
+archives_path="${bdsm_path}/archives"
  19
+scm_path="${bdsm_path}/scm"
  20
+
3 21
 ./local --call=install/install_bdsm
17  local
@@ -19,21 +19,8 @@
19 19
 # record this early on.
20 20
 initial_pwd="$PWD"
21 21
 
22  
-# The default prefix is /usr/local,
23  
-# this should be set to where BDSM is installed to in /etc/bdsmrc
24  
-if [[ -z "${bdsm_path}" ]]
25  
-then
26  
-  if (( UID == 0 ))
27  
-  then
28  
-    bdsm_path="/usr/local/bdsm"
29  
-  else
30  
-    bdsm_path="$HOME/.bdsm"
31  
-  fi
32  
-fi
33  
-
34  
-# set BDSM basic paths
35  
-install_path="${bdsm_path}" # Path to install everything to
36  
-bdsm_path="$PWD"            # Path to load everything from
  22
+# Path to load everything from
  23
+bdsm_path="$PWD"
37 24
 modules_path="${bdsm_path}/extensions/builtin/core/modules"
38 25
 export initial_pwd bdsm_path modules_path
39 26
 

0 notes on commit 82d5c76

Please sign in to comment.
Something went wrong with that request. Please try again.