From 1b58243659066ebaee64bd29c10c2d8534f6fc77 Mon Sep 17 00:00:00 2001 From: jasio Date: Wed, 13 Oct 2021 08:34:32 +0000 Subject: [PATCH 1/8] Update 'README.md' --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 30f223e..a995ce3 100644 --- a/README.md +++ b/README.md @@ -32,6 +32,7 @@ Request WM/DEs [here](https://github.com/crystal-linux/citrine/issues/1). | --- | --- | --- | | **Budgie** | ✅ | | **Cinnamon** | ✅ | +| **Cutefish** | ❌ | **DOES NOT WORK AT ALL** | | **Deepin** | ✅ | | **Enlightenment** | ✅ | | **Gnome** | ✅ | From 39f9dd112ebea42334e9112aeffb9b9426924593 Mon Sep 17 00:00:00 2001 From: axtlos Date: Thu, 14 Oct 2021 19:44:57 +0000 Subject: [PATCH 2/8] Remove extra `read` at end of citrine --- citrine.internal.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/citrine.internal.sh b/citrine.internal.sh index 98af060..2490793 100755 --- a/citrine.internal.sh +++ b/citrine.internal.sh @@ -209,6 +209,4 @@ fi arch-chroot /mnt /continue.sh 2>&1 | tee /mnt/var/log/citrine.chroot.log rm /mnt/continue.sh -inf "Installation should now be complete." -read - +inf "Installation should now be complete." \ No newline at end of file From 845074fc3975d3791eb19f26c15a41042d373f38 Mon Sep 17 00:00:00 2001 From: Matt C Date: Tue, 19 Oct 2021 15:21:20 -0400 Subject: [PATCH 3/8] set sudo pwfeedback --- continue.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/continue.sh b/continue.sh index 83c110d..d489beb 100755 --- a/continue.sh +++ b/continue.sh @@ -105,6 +105,10 @@ 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 From baf516edbdb5ebd2b04ab683927f30b8f0550f68 Mon Sep 17 00:00:00 2001 From: Matt C Date: Wed, 20 Oct 2021 11:17:23 -0400 Subject: [PATCH 4/8] hopefully fixed #1 --- continue.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/continue.sh b/continue.sh index 83c110d..0298309 100755 --- a/continue.sh +++ b/continue.sh @@ -39,7 +39,11 @@ if [[ "$MORE" == "y" || "$MORE" == "Y" ]]; then prompt "Preferred editor" PGRM="$response" echo "PGRM=$response" - if [[ -x "$(command -v ${PGRM})" ]]; then + + inf "Checking if we have ${PGRM} already.." + which ${PGRM} + + if [[ "$?" == "1" ]]; then inf "Attempting to install ${PGRM}" pacman -Sy ${PGRM} --noconfirm fi From 78e66b3aad9bc7af9e65a9edef85ce09d75822b2 Mon Sep 17 00:00:00 2001 From: Matt C Date: Wed, 20 Oct 2021 11:20:12 -0400 Subject: [PATCH 5/8] Fix readme --- README.md | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/README.md b/README.md index a995ce3..8921b82 100644 --- a/README.md +++ b/README.md @@ -1,16 +1,12 @@

- + Logo

Citrine

- - - - Discord

Command line Crystal Linux installer

From f1d4a925736b229695fa76af3b3640d74c1a2819 Mon Sep 17 00:00:00 2001 From: Matt C Date: Wed, 20 Oct 2021 11:24:15 -0400 Subject: [PATCH 6/8] fixed vim editor choice for y'all losers who can't accept that other editors exist /s --- README.md | 2 +- continue.sh | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 8921b82..46bdef2 100644 --- a/README.md +++ b/README.md @@ -35,7 +35,7 @@ Request WM/DEs [here](https://github.com/crystal-linux/citrine/issues/1). | **KDE** | ✅ | | **LXDE** | ✅ | | **LXQt** | ✅ | -| **Mate** | ✅ | Seems to have fonts missing. See #10 | +| **Mate** | ✅ | Seems to have fonts missing. | | **UKUI** | ✅ | | **XFCE** | ✅ | diff --git a/continue.sh b/continue.sh index 97299fa..361337a 100755 --- a/continue.sh +++ b/continue.sh @@ -40,6 +40,11 @@ if [[ "$MORE" == "y" || "$MORE" == "Y" ]]; then PGRM="$response" echo "PGRM=$response" + if [[ "$PGRM" == *"vim"* ]]; then + inf "The only *vim* package we support is nvim. Sorry!" + PGRM="neovim" + fi + inf "Checking if we have ${PGRM} already.." which ${PGRM} @@ -47,6 +52,11 @@ if [[ "$MORE" == "y" || "$MORE" == "Y" ]]; then inf "Attempting to install ${PGRM}" pacman -Sy ${PGRM} --noconfirm fi + + if [[ "$PGRM" == "neovim" ]]; then + PGRM="nvim" + fi + inf "When we open the file, please remove the leading # before any locales you need." inf "Then, save and exit.\nPress enter." read From a911136979e5b78a2dcf280d3fd8440d0c17270d Mon Sep 17 00:00:00 2001 From: Matt C Date: Wed, 20 Oct 2021 11:30:29 -0400 Subject: [PATCH 7/8] ok sorry (not) we're using micro now --- citrine.internal.sh | 4 ++-- continue.sh | 23 +---------------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/citrine.internal.sh b/citrine.internal.sh index 2490793..bf9f963 100755 --- a/citrine.internal.sh +++ b/citrine.internal.sh @@ -176,10 +176,10 @@ fi inf "Setting up base Crystal System" -crystalstrap /mnt base linux linux-firmware systemd-sysvcompat networkmanager grub crystal-grub-theme man-db man-pages texinfo nano sudo curl archlinux-keyring neofetch +crystalstrap /mnt base linux linux-firmware systemd-sysvcompat networkmanager grub crystal-grub-theme man-db man-pages texinfo micro sudo curl archlinux-keyring neofetch if [[ ! "$?" == "0" ]]; then inf "CrystalStrap had some error. Retrying." - crystalstrap /mnt base linux linux-firmware systemd-sysvcompat networkmanager grub crystal-grub-theme man-db man-pages texinfo nano sudo curl archlinux-keyring neofetch + crystalstrap /mnt base linux linux-firmware systemd-sysvcompat networkmanager grub crystal-grub-theme man-db man-pages texinfo micro sudo curl archlinux-keyring neofetch fi if [[ "$EFI" == "yes" ]]; then diff --git a/continue.sh b/continue.sh index 361337a..fecbf7e 100755 --- a/continue.sh +++ b/continue.sh @@ -36,31 +36,10 @@ echo "MORE=$response" MORE="$response" if [[ "$MORE" == "y" || "$MORE" == "Y" ]]; then - prompt "Preferred editor" - PGRM="$response" - echo "PGRM=$response" - - if [[ "$PGRM" == *"vim"* ]]; then - inf "The only *vim* package we support is nvim. Sorry!" - PGRM="neovim" - fi - - inf "Checking if we have ${PGRM} already.." - which ${PGRM} - - if [[ "$?" == "1" ]]; then - inf "Attempting to install ${PGRM}" - pacman -Sy ${PGRM} --noconfirm - fi - - if [[ "$PGRM" == "neovim" ]]; then - PGRM="nvim" - fi - inf "When we open the file, please remove the leading # before any locales you need." inf "Then, save and exit.\nPress enter." read - ${PGRM} /etc/locale.gen + micro /etc/locale.gen fi inf "Generating selected locales." From fbe86e33ecb168aadb21c2b0f58e9830c72fb9ad Mon Sep 17 00:00:00 2001 From: Matt C Date: Wed, 20 Oct 2021 11:37:48 -0400 Subject: [PATCH 8/8] fix #3 --- continue.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/continue.sh b/continue.sh index fecbf7e..11c2889 100755 --- a/continue.sh +++ b/continue.sh @@ -104,7 +104,7 @@ 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