Skip to content

Commit 26d1b48

Browse files
committed
update script/jinstall.sh
1 parent 8120bfa commit 26d1b48

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

script/jinstall.sh

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@ Options:
2727
2828
Give other parameters in order, use "" or empty for the default
2929
30-
[Dir] - installation directory, default $HOME/$V
30+
[Dir] - installation top level directory, default $HOME.
31+
The installation is to a $V subdirectory of this.
3132
[Jqt] - Jqt installed, one of none|slim|full (default full)
3233
[Addons] - Addons installed, one of none|all (default none)
3334
@@ -81,9 +82,10 @@ case "$A" in
8182
*) echo "Invalid Addons selection: $A"; exit 1 ;;
8283
esac
8384

84-
# resolve directory path and add J version
85+
# resolve directory path
8586
mkdir -p $D
86-
D="$(cd -P "$D" && pwd -P)/$V"
87+
cd $D
88+
D=`pwd`
8789

8890
# ----------------------------------------------------------------------
8991
# install message + prompt to continue
@@ -112,8 +114,6 @@ if [ "$FORCE" = 0 ]; then
112114
esac
113115
fi
114116

115-
exit 0
116-
117117
M=$(mktemp -d -t 'jtemp.XXXXXX')
118118
cd $M
119119

@@ -129,9 +129,9 @@ else
129129
tar -xf $W
130130
fi
131131

132-
cd -
133-
cp -r $M/$V/* $D
134-
cd $D
132+
mkdir -p $D/$V
133+
cp -r $M/$V/* $D/$V
134+
cd $D/$V
135135
rm -rf $M
136136

137137
bin/jconsole -js "install 'system $P $A'"

0 commit comments

Comments
 (0)