@@ -86,12 +86,6 @@ if [[ ${java_dist_filename: -7} != ".tar.gz" ]]; then
86
86
exit 1
87
87
fi
88
88
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
-
95
89
# Create the default directory if user has not specified any other path
96
90
if [[ $java_dir == $default_java_dir ]]; then
97
91
mkdir -p $java_dir
@@ -123,8 +117,10 @@ if [[ ! -d $extracted_dirname ]]; then
123
117
tar -xof $java_dist -C $java_dir
124
118
echo " JDK is extracted to $extracted_dirname "
125
119
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
128
124
fi
129
125
130
126
if [[ ! -f " ${extracted_dirname} /bin/java" ]]; then
@@ -173,6 +169,11 @@ elif [[ $jdk_dir =~ ^jdk1\.8.* ]]; then
173
169
fi
174
170
175
171
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
176
177
if (confirm " Install Java Cryptography Extension (JCE) Unlimited Strength Jurisdiction Policy Files?" ); then
177
178
echo " Extracting policy jars in $unlimited_jce_policy_dist to $extracted_dirname /jre/lib/security"
178
179
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
210
211
fi
211
212
fi
212
213
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
216
219
else
217
- echo " export JAVA_HOME=$extracted_dirname " >> $HOME /.bashrc
220
+ echo " export JAVA_HOME=$extracted_dirname " >> $USER_HOME /.bashrc
218
221
fi
219
- source $HOME /.bashrc
220
222
fi
221
223
222
- applications_dir=" $HOME /.local/share/applications"
224
+ applications_dir=" $USER_HOME /.local/share/applications"
223
225
224
226
create_jmc_shortcut () {
225
227
shortcut_file=" $applications_dir /jmc_$jdk_major_version .desktop"
0 commit comments