Merge pull request hykilpikonna#8 from Jin-Asanami/staging

merge from staging branch
aaronfranke · Dec 4, 2022 · a6b0a2c · a6b0a2c
2 parents aa37ff2 + 2cbdd9c
commit a6b0a2c
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,6 @@
 1.1.2
 Update Makefile & CONTRIBUTING.md (dylanaraps#2245 & dylanaraps#2246)
+Add Aster logo (dylanaraps#2251 +α)
 
 1.1.1
 Add Hybrid Linux (dylanaraps#2239)

diff --git a/neofetch b/neofetch
@@ -806,7 +806,7 @@ image_source="auto"
 #
 # NOTE: AIX, AlmaLinux, Alpine, Alter, Amazon, AmogOS, Anarchy, Android, Antergos, antiX, AOSC OS,
 # AOSC OS/Retro, Aperio GNU/Linux, Apricity, Arch, ArchBox, Archcraft, ARCHlabs, ArchMerge,
-# ArchStrike, ArcoLinux, Artix, Arya, Asahi, AsteroidOS, astOS, Bedrock, BigLinux, Bitrig,
+# ArchStrike, ArcoLinux, Artix, Arya, Asahi, Aster, AsteroidOS, astOS, Bedrock, BigLinux, Bitrig,
 # BlackArch, blackPanther, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, Cachy OS,
 # Calculate, CalinixOS, Carbs, CBL-Mariner, CelOS, Center, CentOS, Chakra, ChaletOS, Chapeau,
 # ChonkySealOS, Chrom, Cleanjaro, Clear Linux OS, ClearOS, Clover, Cobalt Linux, Condres, 
@@ -5859,7 +5859,7 @@ ASCII:
 
                                 NOTE: AIX, AlmaLinux, Alpine, Alter, Amazon, AmogOS, Anarchy, Android, Antergos, antiX, AOSC OS,
                                 AOSC OS/Retro, Aperio GNU/Linux, Apricity, Arch, ArchBox, Archcraft, ARCHlabs, ArchMerge,
-                                ArchStrike, ArcoLinux, Artix, Arya, Asahi, AsteroidOS, astOS, Bedrock, BigLinux, Bitrig,
+                                ArchStrike, ArcoLinux, Artix, Arya, Asahi, Aster, AsteroidOS, astOS, Bedrock, BigLinux, Bitrig,
                                 BlackArch, blackPanther, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, Cachy OS,
                                 Calculate, CalinixOS, Carbs, CBL-Mariner, CelOS, Center, CentOS, Chakra, ChaletOS, Chapeau,
                                 ChonkySealOS, Chrom, Cleanjaro, Clear Linux OS, ClearOS, Clover, Cobalt Linux, Condres, 
@@ -6300,6 +6300,7 @@ ${c3}(((((((((((((((((((((${c5}@@@${c6}&%&${c5}@@@%${c4},..........
 EOF
         ;;
 
+
         "Hash"*)
             set_colors 123
             read -rd '' ascii_data <<'EOF'
@@ -7150,6 +7151,30 @@ ${c4}                    %%%
 EOF
         ;;
 
+        "Aster"*)
+            set_colors 6 6
+            read -rd '' ascii_data <<'EOF'                                        
+${c1}                      ...''...         
+${c1}                 .;oOXWMWNXXXNMMN0d:.   
+${c1}              .oXMWOo;..       ..:oO;   
+${c1}            ;KMWx,       co,            
+${c1}          'KMNl         dMMW.           
+${c1}         oMMx          xMMMMk           
+${c1}        xMM:          dMMMMMM;          
+${c1}       cMMl          dMMMMMMMW          
+${c1}       NMK          xMMMx::dXMx         
+${c1}      ,MMl         xMMN'     .o.        
+${c1}      cMM;        dMMW'                 
+${c1}      ;MMc       oMMW,                  
+${c1}       WMK      dMMW,  ccccccc.         
+${c1}       lMMl    oMMM;   ooooooo.         
+${c1}        OMMc   ...                      
+${c1}         xMMx                           
+${c1}          ;XMN:                         
+${c1}            ,.                          
+EOF
+      ;;
+
         "Bedrock"*)
             set_colors 8 7
             read -rd '' ascii_data <<'EOF'

diff --git a/neofetch.1 b/neofetch.1
@@ -1,5 +1,5 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.49.2.
-.TH UNIFETCH "1" "November 2022" "UniFetch 1.1.1 == Neofetch 7.4.0.1" "User Commands"
+.TH UNIFETCH "1" "December 2022" "UniFetch 1.1.1 == Neofetch 7.4.0.1" "User Commands"
 .SH NAME
 UniFetch \- A fast, highly customizable system info script
 .SH SYNOPSIS
@@ -308,7 +308,7 @@ Which Distro's ascii art to print
 .TP
 NOTE: AIX, AlmaLinux, Alpine, Alter, Amazon, AmogOS, Anarchy, Android, Antergos, antiX, AOSC OS,
 AOSC OS/Retro, Aperio GNU/Linux, Apricity, Arch, ArchBox, Archcraft, ARCHlabs, ArchMerge,
-ArchStrike, ArcoLinux, Artix, Arya, Asahi, AsteroidOS, astOS, Bedrock, BigLinux, Bitrig,
+ArchStrike, ArcoLinux, Artix, Arya, Asahi, Aster, AsteroidOS, astOS, Bedrock, BigLinux, Bitrig,
 BlackArch, blackPanther, BLAG, BlankOn, BlueLight, Bodhi, bonsai, BSD, BunsenLabs, Cachy OS,
 Calculate, CalinixOS, Carbs, CBL\-Mariner, CelOS, Center, CentOS, Chakra, ChaletOS, Chapeau,
 ChonkySealOS, Chrom, Cleanjaro, Clear Linux OS, ClearOS, Clover, Cobalt Linux, Condres,