WSJTX and JS8CALL conflict warning messages

joecupano · Sep 5, 2023 · f3cd035 · f3cd035
1 parent 0cc57f9
commit f3cd035
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 10 deletions.
diff --git a/packages/pkg_js8call b/packages/pkg_js8call
@@ -44,9 +44,11 @@ case "$1" in
         if grep wsjtx "$SIGPI_CONFIG"; then
             echo -e "${SIGPI_BANNER_COLOR}"
             echo -e "${SIGPI_BANNER_COLOR} ##"
-            echo -e "${SIGPI_BANNER_COLOR} ## ERROR: JS8CALL cannot be installed while WSJT-X is installed due to library conflicts"
+            echo -e "${SIGPI_BANNER_COLOR} ##   ERROR: JS8CALL cannot be installed while WSJT-X is installed due to library conflicts"
             echo -e "${SIGPI_BANNER_COLOR} ##"
-            echo -e "${SIGPI_BANNER_COLOR}"
+            echo -e "${SIGPI_BANNER_COLOR} ##   JS8CALL Install Terminated"
+            echo -e "${SIGPI_BANNER_COLOR} ##"
+            echo -e "${SIGPI_BANNER_RESET}"
         else
             cd $SIGPI_SOURCE
             sudo apt-get install -y js8call
@@ -61,11 +63,12 @@ case "$1" in
 	        sudo sed -i "s/Categories.*/Categories=$SIGPI_MENU_CATEGORY;/" $DESKTOP_FILES/js8call.desktop
             # Add to Menu
             xdg-desktop-menu install --novendor --noupdate $DESKTOP_DIRECTORY/SIGpishell.directory $DESKTOP_FILES/js8call.desktop
+            echo -e "${SIGPI_BANNER_COLOR}"
+            echo -e "${SIGPI_BANNER_COLOR} ##   JS8CALL Installed"
+            echo -e "${SIGPI_BANNER_RESET}"
         fi
 
-        echo -e "${SIGPI_BANNER_COLOR}"
-        echo -e "${SIGPI_BANNER_COLOR} ##   JS8CALL Installed"
-        echo -e "${SIGPI_BANNER_RESET}"
+
         ;;
     * )
         echo -e "${SIGPI_BANNER_COLOR}"

diff --git a/packages/pkg_wsjtx b/packages/pkg_wsjtx
@@ -53,7 +53,9 @@ case "$1" in
         if grep js8call "$SIGPI_CONFIG"; then
             echo -e "${SIGPI_BANNER_COLOR}"
             echo -e "${SIGPI_BANNER_COLOR} ##"
-            echo -e "${SIGPI_BANNER_COLOR} ## ERROR: WSJT-X cannot be installed while JS8CALL is installed due to library conflicts"
+            echo -e "${SIGPI_BANNER_COLOR} ##   ERROR: WSJT-X cannot be installed while JS8CALL is installed due to library conflicts"
+            echo -e "${SIGPI_BANNER_COLOR} ##"
+            echo -e "${SIGPI_BANNER_COLOR} ##   WSTJT-X Install Temrinated"
             echo -e "${SIGPI_BANNER_COLOR} ##"
             echo -e "${SIGPI_BANNER_COLOR}"
         else
@@ -79,11 +81,11 @@ case "$1" in
             # Add to Menu
             xdg-desktop-menu install --novendor --noupdate $DESKTOP_DIRECTORY/HamRadio.directory $DESKTOP_FILES/wsjtx.desktop
             xdg-desktop-menu install --novendor --noupdate $DESKTOP_DIRECTORY/HamRadio.directory $DESKTOP_FILES/message_aggregator.desktop
+
+            echo -e "${SIGPI_BANNER_COLOR}"
+            echo -e "${SIGPI_BANNER_COLOR} ##   WSJT-X Installed"
+            echo -e "${SIGPI_BANNER_RESET}"
         fi
-
-        echo -e "${SIGPI_BANNER_COLOR}"
-        echo -e "${SIGPI_BANNER_COLOR} ##   WSJT-X Installed"
-        echo -e "${SIGPI_BANNER_RESET}"
         ;;
     * )
         echo -e "${SIGPI_BANNER_COLOR}"