|
@@ -174,6 +174,15 @@ function get_app_icann_address {
|
174
|
174
|
if grep -q "${app_name} domain" $COMPLETION_FILE; then
|
175
|
175
|
echo $(cat ${COMPLETION_FILE} | grep "${app_name} domain" | head -n 1 | awk -F ':' '{print $2}')
|
176
|
176
|
return
|
|
177
|
+ else
|
|
178
|
+ app_name_upper=$(echo "$app_name" | tr '[:lower:]' '[:upper:]')_DOMAIN_NAME
|
|
179
|
+ if [ $app_name_upper ]; then
|
|
180
|
+ param_value=$(cat $CONFIGURATION_FILE | grep "${app_name_upper}=" | head -n 1 | awk -F '=' '{print $2}')
|
|
181
|
+ if [ ${param_value} ]; then
|
|
182
|
+ echo ${param_value}
|
|
183
|
+ return
|
|
184
|
+ fi
|
|
185
|
+ fi
|
177
|
186
|
fi
|
178
|
187
|
echo "${DEFAULT_DOMAIN_NAME}"
|
179
|
188
|
}
|
|
@@ -259,7 +268,7 @@ function view_or_change_passwords {
|
259
|
268
|
|
260
|
269
|
CURR_PASSWORD=$(${PROJECT_NAME}-pass -u ${SELECTED_USERNAME} -a ${SELECTED_APP})
|
261
|
270
|
|
262
|
|
- icann_address=$(get_app_icann_address "$app_name")
|
|
271
|
+ icann_address=$(get_app_icann_address "${SELECTED_APP}")
|
263
|
272
|
onion_address=$(get_app_onion_address "${SELECTED_APP}")
|
264
|
273
|
|
265
|
274
|
titlestr=$"View or Change Password"
|