Merge branch 'master' of https://github.com/dylanaraps/neofetch

neofetch

@@ -799,9 +799,9 @@ image_source="auto"
 #       openEuler, OpenIndiana, openmamba, OpenMandriva, OpenStage, OpenWrt,
 #       osmc, Oracle, OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix,
 #       TrueOS, PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS,
-#       Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS,
-#       Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rocky,
-#       Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor,
+#       Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, 
+#       Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, 
+#       Rocky, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor,
 #       SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS,
 #       Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, openSUSE_Leap, t2,
 #       openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, Trisquel,
@@ -1840,7 +1840,7 @@ get_de() {
             Xfce*)     de_ver=$(xfce4-session --version) ;;
             GNOME*)    de_ver=$(gnome-shell --version) ;;
             Cinnamon*) de_ver=$(cinnamon --version) ;;
-            Deepin*)   de_ver=$(awk -F'=' '/Version/ {print $2}' /etc/deepin-version) ;;
+            Deepin*)   de_ver=$(awk -F'=' '/MajorVersion/ {print $2}' /etc/os-version) ;;
             Budgie*)   de_ver=$(budgie-desktop --version) ;;
             LXQt*)     de_ver=$(lxqt-session --version) ;;
             Lumina*)   de_ver=$(lumina-desktop --version 2>&1) ;;
@@ -1894,6 +1894,7 @@ get_wm() {
                                -e gnome-shell \
                                -e greenfield \
                                -e grefsen \
+                               -e hikari \
                                -e kwin \
                                -e lipstick \
                                -e maynard \
@@ -3451,7 +3452,7 @@ END
         ;;
 
         "mintty")
-            term_font="$(awk -F '=' '!/^($|#)/ && /Font/ {printf $2; exit}' "${HOME}/.minttyrc")"
+            term_font="$(awk -F '=' '!/^($|#)/ && /^\\s*Font\\s*=/ {printf $2; exit}' "${HOME}/.minttyrc")"
         ;;
 
         "pantheon"*)
@@ -5089,7 +5090,7 @@ ASCII:
                                 openmamba, OpenMandriva, OpenStage, OpenWrt, osmc, Oracle,
                                 OS Elbrus, PacBSD, Parabola, Pardus, Parrot, Parsix, TrueOS,
                                 PCLinuxOS, Pengwin, Peppermint, popos, Porteus, PostMarketOS,
-                                Proxmox, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS,
+                                Proxmox, PuffOS, Puppy, PureOS, Qubes, Quibian, Radix, Raspbian, Reborn_OS,
                                 Redstar, Redcore, Redhat, Refracted_Devuan, Regata, Regolith, Rosa,
                                 sabotage, Sabayon, Sailfish, SalentOS, Scientific, Septor,
                                 SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, SmartOS,
@@ -6148,6 +6149,29 @@ ${c1}:syyyyyy/     :yyyyyy/${c2}-yyo.:syyyyyyyyyyy
 EOF
         ;;
 
+        "AsteroidOS"*)
+            set_colors 160 208 202 214
+            read -rd '' ascii_data <<'EOF'
+${c1}                    ***
+${c1}                   *****
+${c1}                **********
+${c1}              ***************
+${c1}           *///****////****////.
+${c2}         (/////// /////// ///////(
+${c2}      /(((((//*     //,     //((((((.
+${c2}    (((((((((((     (((        ((((((((
+${c2} *(((((((((((((((((((((((        ((((((((
+${c3}    (((((#(((((((#(((((        ((#(((((
+${c3}     (#(#(#####(#(#,       ####(#(#
+${c3}         #########        ########
+${c3}           /########   ########
+${c4}              #######%#######
+${c4}                (#%%%%%%%#
+${c4}                   %%%%%
+${c4}                    %%%
+EOF
+        ;;
+
         "Bedrock"*)
             set_colors 8 7
             read -rd '' ascii_data <<'EOF'
@@ -9491,6 +9515,25 @@ ${c1}                 /\\
 EOF
         ;;
 
+        "PuffOS"*)
+            set_colors 3 
+            read -rd '' ascii_data <<'EOF'
+${c1}
+              _,..._,m,   
+            ,/'      '"";     
+           /             ".
+         ,'mmmMMMMmm.      \  
+       _/-"^^^^^"""%#%mm,   ;  
+ ,m,_,'              "###)  ;,
+(###%                 \#/  ;##mm.
+ ^#/  __        ___    ;  (######)
+  ;  //.\\     //.\\   ;   \####/
+ _; (#\"//     \\"/#)  ;  ,/
+@##\ \##/   =   `"=" ,;mm/
+`\##>.____,...,____,<####@
+EOF
+        ;;
+
         "Proxmox"*)
             set_colors 7 202
             read -rd '' ascii_data <<'EOF'