fixed merge issues

README.md

@@ -1,16 +1,12 @@
 <p align="center">
   <a href="https://github.com/crystal-linux">
-    <img src="https://github.com/crystal-linux/branding/blob/main/icons/crystal-logo-minimal-citrine.png?raw=true alt="Logo" width="150" height="150">
+    <img src="https://git.getcryst.al/crystal/branding/raw/branch/main/icons/crystal-logo-minimal-citrine.png" alt="Logo" width="150" height="150">
   </a>
 </p>
 <p align="center"> 
 <h2 align="center"> Citrine </h2>
 </p>
 <p align="center">
-<img src=https://img.shields.io/github/stars/crystal-linux/citrine?style=flat&color=a900ff&logo=Github />
-<img src=https://img.shields.io/github/forks/crystal-linux/citrine?style=flat&color=a900ff&logo=Github />
-<img src=https://img.shields.io/github/issues/crystal-linux/citrine?style=flat&color=a900ff&logo=Github />
-<img src=https://img.shields.io/github/issues-pr/crystal-linux/citrine?style=flat&color=a900ff&logo=Github />
 <a href="https://discord.gg/yp4xpZeAgW"><img alt="Discord" src="https://img.shields.io/discord/825473796227858482?color=blue&label=Discord&logo=Discord&logoColor=white"?link=https://discord.gg/yp4xpZeAgW&link=https://discord.gg/yp4xpZeAgW> </p></a>
 <p align="center"> Command line Crystal Linux installer </p>
 
@@ -32,13 +28,14 @@ Request WM/DEs [here](https://github.com/crystal-linux/citrine/issues/1).
 | --- | --- | --- |
 | **Budgie** | ✅ | 
 | **Cinnamon** | ✅ | 
+| **Cutefish** | ❌ | **DOES NOT WORK AT ALL** |  
 | **Deepin** | ✅ |
 | **Enlightenment** | ✅ |
 | **Gnome** | ✅ |
 | **KDE** | ✅ | 
 | **LXDE** | ✅ | 
 | **LXQt** | ✅ | 
-| **Mate** | ✅ | Seems to have fonts missing. See #10 |
+| **Mate** | ✅ | Seems to have fonts missing. |
 | **UKUI** | ✅ | 
 | **XFCE** | ✅ | 
 

citrine.internal.sh

@@ -240,7 +240,11 @@ fi
 arch-chroot /mnt /continue.sh 2>&1 | tee /mnt/var/log/citrine.chroot.log
 rm /mnt/continue.sh
 
+<<<<<<< HEAD
 dumptitle="Citrine"
 dump "Installation should now be complete."
 #read
 
+=======
+inf "Installation should now be complete."
+>>>>>>> main

continue.sh

@@ -124,9 +124,13 @@ echo >> /etc/sudoers
 echo "# Enabled by Crystalinstall" >> /etc/sudoers
 echo "%wheel ALL=(ALL) ALL" >> /etc/sudoers
 
+echo >> /etc/sudoers
+echo "# Enabled by Crystalinstall" >> /etc/sudoers
+echo "Defaults pwfeedback" >> /etc/sudoers
+
 if [[ -f /efimode ]]; then
     rm /efimode
-    grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=Crystal
+    grub-install --target=x86_64-efi --efi-directory=/efi --bootloader-id=Crystal --removeable
 else
     DISK=$(cat /diskn)
     rm /diskn