fix remove packages in community

biglinux · Nov 9, 2023 · b03d788 · b03d788
1 parent fb7fc28
commit b03d788
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 12 deletions.
diff --git a/usr/share/bigbashview/bcc/apps/bigbashview-calamares/community.sh.htm b/usr/share/bigbashview/bcc/apps/bigbashview-calamares/community.sh.htm
@@ -120,8 +120,8 @@ <h5 class="center-align small bold">$TXT_TITLE_INSTALL</h5>
           <div>
             <a href="#" class="secundary round extra elevate tiny-padding" data-ui="#dialog-modal">
               <i>attach_file</i>
-            </a> 
-          </div>  
+            </a>
+          </div>
           <span class="helper">$TXT_HELPER</span>
         </div>
       </div>

diff --git a/usr/share/bigbashview/bcc/apps/bigbashview-calamares/community_verify_pkgs2.sh.htm b/usr/share/bigbashview/bcc/apps/bigbashview-calamares/community_verify_pkgs2.sh.htm
@@ -50,7 +50,7 @@
 
 if [ "$remove_packages" != "" ]; then
     for package in $(echo $remove_packages | tr -d '\r'); do
-        if [ -z "$(grep "$package" /rootfs-pkgs.txt)" ]; then
+        if [ -z "$(grep "\b$package\b" /rootfs-pkgs.txt)" ]; then
             echo $package >> /tmp/biglinux-calamares-pkg-remove.err
             pkgProblemRemove="yes"
         fi
@@ -72,21 +72,21 @@
 
 #DESKTOP CLI
 
-if [ "$desktop_selected" = "cli" -a -n "$login_manager" ];then
+# if [ "$desktop_selected" = "cli" -a -n "$login_manager" ];then
+#     if [ -z "$(echo $install_packages | grep $login_manager)" ];then
+#         msg_not_login="$NotPossibleLogin  $login_manager "
+#         pkgProblem="yes"
+#     else
+#         msg_not_login=""
+#     fi
+# elif [ "$desktop_selected" != "cli" ];then 
     if [ -z "$(echo $install_packages | grep $login_manager)" ];then
         msg_not_login="$NotPossibleLogin  $login_manager "
         pkgProblem="yes"
     else
         msg_not_login=""
     fi
-elif [ "$desktop_selected" != "cli" ];then 
-    if [ -z "$(echo $install_packages | grep $login_manager)" ];then
-        msg_not_login="$NotPossibleLogin  $login_manager "
-        pkgProblem="yes"
-    else
-        msg_not_login=""
-    fi
-fi
+# fi
 
 read -d $"" ShowText << EOF
 <!DOCTYPE html>
-Original file line number
+Diff line change
@@ Expand Up / @@ -120,8 +120,8 @@ <h5 class="center-align small bold">$TXT_TITLE_INSTALL</h5> @@
               <div>
                 <a href="#" class="secundary round extra elevate tiny-padding" data-ui="#dialog-modal">
                   <i>attach_file</i>
-                </a>
-              </div>
+                </a>
+              </div>
               <span class="helper">$TXT_HELPER</span>
             </div>
           </div>
@@ Expand Down @@