From a47d635070280f03895d88128f7b072f325be029 Mon Sep 17 00:00:00 2001
From: Florian RICHER <florian.richer@unova.fr>
Date: Thu, 17 Jun 2021 22:03:31 +0200
Subject: [PATCH] Fixes

---
 install.sh                |  2 +-
 install_scripts/ubuntu.sh | 60 +++++++++++++++++++--------------------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/install.sh b/install.sh
index 00050a6..269eb10 100755
--- a/install.sh
+++ b/install.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-OS_NAME=`cat /etc/os-release | grep "^NAME=" | sed 's/NAME=//g'`
+OS_NAME=`cat /etc/os-release | grep "^NAME=" | sed 's/NAME=//g' | sed 's/"//g'`
 OS_NAME=${OS_NAME^^} # UPPERCASE
 
 case $OS_NAME in
diff --git a/install_scripts/ubuntu.sh b/install_scripts/ubuntu.sh
index 6ac82fc..8448670 100755
--- a/install_scripts/ubuntu.sh
+++ b/install_scripts/ubuntu.sh
@@ -1,70 +1,70 @@
 refresh_repo () {
-    echo -n "Refreshing repo..."
+    echo "Refreshing repo..."
     sudo apt update
 }
 
 install_fish() {
     refresh_repo
-    echo -n "Installing fish..."
+    echo "Installing fish..."
     sudo apt install fish -y
-    echo -n "Success"
-    read -p "Install oh-my-zsh ? (y/n) [n]" ok
+    echo "Success"
+    read -p "Install oh-my-fish ? (y/n) [n] " ok
     case $ok in
         [yY]*)
-            sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
-            echo -n "Success"
+            curl -L https://get.oh-my.fish | fish
+            echo "Success"
             ;;
         *)
-            echo -n "No modification"
+            echo "No modification"
             ;;
     esac
-    read -p "Set to default shell ? (y/n) [n]" ok
+    read -p "Set to default shell ? (y/n) [n] " ok
     case $ok in
         [yY]*)
             FISH_BIN=`which fish`
             chsh -s "$FISH_BIN" "$USER"
-            echo -n "Success"
+            echo "Success"
             ;;
         *)
-            echo -n "No modification"
+            echo "No modification"
             ;;
     esac
-    read -p "Install agnoster theme ? (y/n) [n]" ok
+    read -p "Install agnoster theme ? (y/n) [n] " ok
     case $ok in
         [yY]*)
             fish -c "omf install agnoster"
-            echo -n "Success"
+            echo "Success"
             ;;
         *)
-            echo -n "No modification"
+            echo "No modification"
             ;;
     esac
 }
 
 install_zsh() {
     refresh_repo
-    echo -n "Installing zsh..."
+    echo "Installing zsh..."
     sudo apt install zsh -y
-    echo -n "Success"
-    read -p "Install oh-my-zsh ? (y/n) [n]" ok
+    echo "Success"
+    read -p "Install oh-my-zsh ? (y/n) [n] " ok
     case $ok in
         [yY]*)
-            curl -L https://get.oh-my.fish | fish
-            echo -n "Success"
+            sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+            echo "Success"
             ;;
         *)
-            echo -n "No modification"
+            echo "No modification"
             ;;
     esac
-    read -p "Set to default shell ? (y/n) [n]" ok
+    read -p "Set to default shell ? (y/n) [n] " ok
     case $ok in
         [yY]*)
             ZSH_BIN=`which zsh`
             chsh -s "$ZSH_BIN" "$USER"
-            echo -n "Success"
+            echo "Success"
             ;;
         *)
-            echo -n "No modification"
+            echo "No modification"
             ;;
     esac
 }
@@ -73,8 +73,8 @@ install_neovim () {
     sudo add-apt-repository ppa:neovim-ppa/unstable -y
     refresh_repo
     sudo apt-get install neovim -y
-    echo -n "Success"
-    read -p "Install custom config (Warning : Erase old conf) ? (y/n) [n]" ok
+    echo "Success"
+    read -p "Install custom config (Warning : Erase old conf) ? (y/n) [n] " ok
     case $ok in
         [yY]*)
             rm -rf ~/.config/nvim
@@ -84,14 +84,14 @@ install_neovim () {
             sudo apt install ripgrep -y
             ;;
         *)
-            echo -n "No modification"
+            echo "No modification"
             ;;
     esac
 }
 
 
 start () {
-    read -p "Select you shell. (0 - current, 1 - fish, 2 - zsh) [0]" shell
+    read -p "Select you shell. (0 - current, 1 - fish, 2 - zsh) [0] " shell
     case $shell in
         "1")
             install_fish
@@ -100,16 +100,16 @@ start () {
             install_zsh
             ;;
         *)
-            echo -n "No modification"
+            echo "No modification"
             ;;
     esac
-    read -p "Install nvim 0.5 ? (y/n) [n]" ok
+    read -p "Install nvim 0.5 ? (y/n) [n] " ok
     case $ok in
         [yY]*)
             install_neovim
             ;;
         *)
-            echo -n "No modification"
+            echo "No modification"
             ;;
     esac
-}
\ No newline at end of file
+}