Skip to content
Snippets Groups Projects
Commit 7ad55854 authored by Jonathan Wilkes's avatar Jonathan Wilkes
Browse files

Merge branch 'aggraef/purr-data-inst_dir-fix'

parents b33111ef 4fd5dbb0
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
l2ork_addons/tar_em_up.sh
+ 4
− 4
View file @ 7ad55854
...@@ -40,8 +40,6 @@ pkg=1 ...@@ -40,8 +40,6 @@ pkg=1
inno=0 inno=0
dmg=0 dmg=0
inst_dir=${inst_dir:-/usr/local}
# Get the OS we're running under, normalized to names that can be used # Get the OS we're running under, normalized to names that can be used
# to fetch the nwjs binaries below # to fetch the nwjs binaries below
...@@ -125,10 +123,10 @@ do case $Option in ...@@ -125,10 +123,10 @@ do case $Option in
a) addon=1;; a) addon=1;;
b) deb=1 b) deb=1
inst_dir=/usr;; inst_dir=${inst_dir:-/usr};;
B) deb=2 B) deb=2
inst_dir=/usr;; inst_dir=${inst_dir:-/usr};;
c) core=1;; c) core=1;;
...@@ -166,6 +164,8 @@ do case $Option in ...@@ -166,6 +164,8 @@ do case $Option in
esac esac
done done
inst_dir=${inst_dir:-/usr/local}
export TAR_EM_UP_PREFIX=$inst_dir export TAR_EM_UP_PREFIX=$inst_dir
cd ../ cd ../
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment