|
@@ -167,20 +167,14 @@ showHelp() {
|
167
|
167
|
echo "---------------------"
|
168
|
168
|
echo "-h, --help Help information"
|
169
|
169
|
echo "-r, --release [version] This is a release"
|
170
|
|
-# echo "-s, --script Don't use installer.jar (not implemented yet)"
|
171
|
170
|
echo "---------------------"
|
172
|
171
|
exit 0;
|
173
|
172
|
}
|
174
|
173
|
|
175
|
174
|
# Check for some CLI params
|
176
|
|
-scriptOnly="false"
|
177
|
175
|
isRelease=""
|
178
|
176
|
while test -n "$1"; do
|
179
|
177
|
case "$1" in
|
180
|
|
- --script|-s)
|
181
|
|
- scriptOnly="true"
|
182
|
|
- shift
|
183
|
|
- ;;
|
184
|
178
|
--release|-r)
|
185
|
179
|
shift
|
186
|
180
|
isRelease=${1}
|
|
@@ -197,23 +191,19 @@ if [ "${isRelease}" != "" ]; then
|
197
|
191
|
fi
|
198
|
192
|
|
199
|
193
|
if [ -e "DMDirc.jar" ]; then
|
200
|
|
- if [ "${scriptOnly}" = "true" ]; then
|
201
|
|
- echo "Script-only install requested."
|
202
|
|
- else
|
203
|
|
- echo "Checking java version.."
|
204
|
|
- ${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main --help >/dev/null
|
|
194
|
+ echo "Checking java version.."
|
|
195
|
+ ${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main --help >/dev/null
|
|
196
|
+ if [ $? -ne 0 ]; then
|
|
197
|
+ installjre "upgrade"
|
|
198
|
+ echo "Trying to run installer.."
|
|
199
|
+ ${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main ${isRoot}${isRelease}
|
205
|
200
|
if [ $? -ne 0 ]; then
|
206
|
|
- installjre "upgrade"
|
207
|
|
- echo "Trying to run installer.."
|
208
|
|
- ${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main ${isRoot}${isRelease}
|
209
|
|
- if [ $? -ne 0 ]; then
|
210
|
|
- exit 1;
|
211
|
|
- fi;
|
212
|
|
- else
|
213
|
|
- echo "Running installer.."
|
214
|
|
- ${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main ${isRoot}${isRelease}
|
215
|
|
- fi
|
216
|
|
- exit 0;
|
|
201
|
+ exit 1;
|
|
202
|
+ fi;
|
|
203
|
+ else
|
|
204
|
+ echo "Running installer.."
|
|
205
|
+ ${JAVA} -cp DMDirc.jar com.dmdirc.installer.Main ${isRoot}${isRelease}
|
|
206
|
+ exit $?
|
217
|
207
|
fi
|
218
|
208
|
else
|
219
|
209
|
echo "No installer found!"
|