Skip to content

Commit 2f9b26c

Browse files
committed
Support Ubuntu 20.04
Minor improvements: Check unzip command when it is needed. Update .bashrc of the correct user. Allow to continue installation when the directory exists. This will allow to run update-alternatives
1 parent d1bdd23 commit 2f9b26c

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

install-java.sh

+16-14
Original file line numberDiff line numberDiff line change
@@ -86,12 +86,6 @@ if [[ ${java_dist_filename: -7} != ".tar.gz" ]]; then
8686
exit 1
8787
fi
8888

89-
#Check whether unzip command exsits
90-
if ! command -v unzip >/dev/null 2>&1; then
91-
echo "Please install unzip (apt -y install unzip)."
92-
exit 1
93-
fi
94-
9589
# Create the default directory if user has not specified any other path
9690
if [[ $java_dir == $default_java_dir ]]; then
9791
mkdir -p $java_dir
@@ -123,8 +117,10 @@ if [[ ! -d $extracted_dirname ]]; then
123117
tar -xof $java_dist -C $java_dir
124118
echo "JDK is extracted to $extracted_dirname"
125119
else
126-
echo "WARN: JDK was not extracted to $java_dir. There is an existing directory with name $jdk_dir."
127-
exit 1
120+
echo "WARN: JDK was not extracted to $java_dir. There is an existing directory with the name \"$jdk_dir\"."
121+
if ! (confirm "Do you want to continue?"); then
122+
exit 1
123+
fi
128124
fi
129125

130126
if [[ ! -f "${extracted_dirname}/bin/java" ]]; then
@@ -173,6 +169,11 @@ elif [[ $jdk_dir =~ ^jdk1\.8.* ]]; then
173169
fi
174170

175171
if [[ -f $unlimited_jce_policy_dist ]]; then
172+
#Check whether unzip command exsits
173+
if ! command -v unzip >/dev/null 2>&1; then
174+
echo "Please install unzip (apt -y install unzip)."
175+
exit 1
176+
fi
176177
if (confirm "Install Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files?"); then
177178
echo "Extracting policy jars in $unlimited_jce_policy_dist to $extracted_dirname/jre/lib/security"
178179
unzip -j -o $unlimited_jce_policy_dist *.jar -d $extracted_dirname/jre/lib/security
@@ -210,16 +211,17 @@ if [[ ! -d $java_system_prefs_dir ]]; then
210211
fi
211212
fi
212213

213-
if (confirm "Do you want to set JAVA_HOME environment variable in $HOME/.bashrc?"); then
214-
if grep -q "export JAVA_HOME=.*" $HOME/.bashrc; then
215-
sed -i "s|export JAVA_HOME=.*|export JAVA_HOME=$extracted_dirname|" $HOME/.bashrc
214+
USER_HOME="$(getent passwd $SUDO_USER | cut -d: -f6)"
215+
216+
if [[ -d "$USER_HOME" ]] && (confirm "Do you want to set JAVA_HOME environment variable in $USER_HOME/.bashrc?"); then
217+
if grep -q "export JAVA_HOME=.*" $USER_HOME/.bashrc; then
218+
sed -i "s|export JAVA_HOME=.*|export JAVA_HOME=$extracted_dirname|" $USER_HOME/.bashrc
216219
else
217-
echo "export JAVA_HOME=$extracted_dirname" >>$HOME/.bashrc
220+
echo "export JAVA_HOME=$extracted_dirname" >>$USER_HOME/.bashrc
218221
fi
219-
source $HOME/.bashrc
220222
fi
221223

222-
applications_dir="$HOME/.local/share/applications"
224+
applications_dir="$USER_HOME/.local/share/applications"
223225

224226
create_jmc_shortcut() {
225227
shortcut_file="$applications_dir/jmc_$jdk_major_version.desktop"

0 commit comments

Comments
 (0)