include: dts-subscription: move warning print outside login_to_dpp_server

login_to_dpp_server should only try to login, the decision to print
warning or not should be done outside this function basing on the output
of this function. Otherwise every time the function is being called the
warning could be printed too, which is not always wanted.

Signed-off-by: Daniil Klimuk <[email protected]>

Author: DaniilKl

include/dts-functions.sh

@@ -1464,7 +1464,14 @@ main_menu_options(){
 
       # Try to log in using available DPP credentials, start loop over if login
       # was not successful:
-      login_to_dpp_server || return 0
+      login_to_dpp_server
+      if [ $? -ne 0 ]; then
+        print_warning "Your credentials do not have access to DPP packages. If you bought one, check the"
+        print_warning "credentials you have used, and contact support. If you did not buy any DPP"
+        print_warning "packages - feel free to continue."
+        read -p "Press enter to continue"
+        return 0
+      fi
 
       # Check if there is some packages available to install, start loop over if
       # no packages is available:

include/dts-subscription.sh

@@ -95,10 +95,6 @@ login_to_dpp_server(){
   # Check if the user is already logged in, log in if not:
   if [ -z "$(mc alias list | grep ${CLOUDSEND_DOWNLOAD_URL})" ]; then
     if ! mc alias set $DPP_SERVER_USER_ALIAS $DPP_SERVER_ADDRESS $CLOUDSEND_DOWNLOAD_URL $CLOUDSEND_PASSWORD >> $ERR_LOG_FILE 2>&1 ; then
-      print_warning "Your credentials do not have access to DPP packages. If you bought one, check the"
-      print_warning "credentials you have used, and contact support. If you did not buy any DPP"
-      print_warning "packages - feel free to continue."
-      read -p "Press enter to continue"
       return 1
     fi
   fi