ready to merge

git-v1.sh

@@ -1,73 +0,0 @@
-#!/bin/bash
-#
-##################################################################################################################
-# Written to be used on 64 bits computers
-# Author 	: 	Erik Dubois
-# Website 	: 	http://www.erikdubois.be
-##################################################################################################################
-##################################################################################################################
-#
-#   DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK.
-#
-##################################################################################################################
-
-# echo "# Ultimate-Linux-Mint-18" >> README.md
-# git init
-# git add README.md
-# git commit -m "first commit"
-# git remote add origin https://github.com/erikdubois/Ultimate-Linux-Mint-18-Cinnamon.git
-# git push -u origin master
-
-# git config --global user.name x
-# git config --global user.email x
-# sudo git config --system core.editor nano
-# git config --global credential.helper cache
-# git config --global credential.helper 'cache --timeout=3600'
-
-
-# Force git to overwrite local files on pull - no merge
-
-# git fetch all
-
-# git push --set-upstream origin master
-
-# git reset --hard orgin/master
-
-
-# checking if kernel files are present otherswise github will become too big
-
-if [ -f linux* ]; then
-	echo "####################################"
-    	echo "Stopping the script!!"
-    	echo "Wait for the kernel update script to quit."
-    	echo "####################################"
-    	exit 0
-fi
-
-
-# checking if I have the latest files from github
-echo "Checking for newer files online first"
-git pull
-
-# Below command will backup everything inside the project folder
-git add --all .
-
-# Give a comment to the commit if you want
-echo "####################################"
-echo "Write your commit comment!"
-echo "####################################"
-
-read input
-
-# Committing to the local repository with a message containing the time details and commit text
-curtime=$(date)
-git commit -m "Comment : $input on $curtime"
-
-# Push the local files to github
-
-git push -u origin master
-
-
-echo "################################################################"
-echo "###################    Git Push Done      ######################"
-echo "################################################################"

screenfetch-dev

@@ -23,7 +23,7 @@
 # to put forth suggestions/ideas. Thank you.
 
 # Requires: bash 4.0+
-# Optional : xorg-xdpyinfo (resoluton detection)
+# Optional dependencies: xorg-xdpyinfo (resoluton detection)
 #                        scrot (screenshot taking)
 #                        curl (screenshot uploading)
 
@@ -291,6 +291,8 @@ getColor () {
 			'black_haiku') 				color_ret="$(colorize '7')";;
 			#ROSA color
 			'rosa_blue') 				color_ret='\033[01;38;05;25m';;
+			# ArcoLinux
+			'arco_blue') color_ret='\033[1;38;05;111m';;
 		esac
 		[[ -n "${color_ret}" ]] && echo "${color_ret}"
 	fi
@@ -355,7 +357,7 @@ detectColors () {
 	my_hcolor=$(colorNumberToCode "${my_hcolor}")
 }
 
-supported_distros="ALDOS, Alpine Linux, Amazon Linux, Antergos, Arch Linux (Old and Current Logos), Artix Linux, \
+supported_distros="ALDOS, Alpine Linux, Amazon Linux, Antergos, Arch Linux (Old and Current Logos), ArcoLinux, Artix Linux, \
 blackPanther OS, BLAG, BunsenLabs, CentOS, Chakra, Chapeau, Chrome OS, Chromium OS, CrunchBang, CRUX, \
 Debian, Deepin, DesaOS,Devuan, Dragora, elementary OS, EuroLinux, Evolve OS, Exherbo, Fedora, Frugalware, Fuduntu, Funtoo, \
 Fux, Gentoo, gNewSense, GuixSD, Hyperbola GNU/Linux-libre, januslinux, Jiyuu Linux, Kali Linux, KaOS, KDE neon, Kogaion, Korora, \
@@ -731,9 +733,9 @@ detectdistro () {
 						distro="LMDE"
 						distro_codename="n/a"
 						distro_release="n/a"
-					#adding support for LMDE 3
+					#adding support for LMDE 3	
 					elif [[ "$(lsb_release -sd)" =~ "LMDE" ]]; then
-						distro="LMDE"
+						distro="LMDE"	
 					fi
 					;;
 				"openSUSE"|"openSUSE project"|"SUSE LINUX" | "SUSE")
@@ -1320,7 +1322,7 @@ detectpkgs () {
 	local offset=0
 	case "${distro}" in
 		'Alpine Linux') pkgs=$(apk info | wc -l) ;;
-		'Arch Linux'|'Parabola GNU/Linux-libre'|'Hyperbola GNU/Linux-libre'|'Chakra'|'Manjaro'|'Antergos'| \
+		'Arch Linux'|'ArcoLinux'|'Parabola GNU/Linux-libre'|'Hyperbola GNU/Linux-libre'|'Chakra'|'Manjaro'|'Antergos'| \
 		'Netrunner'|'KaOS'|'Obarun'|'SwagArch'|'OBRevenge'|'Artix Linux')
 			pkgs=$(pacman -Qq | wc -l) ;;
 		'Chrome OS')
@@ -1635,7 +1637,7 @@ DetectIntelGPU() {
 
 	case $gpu in
 		*mfb)
-			gpu=$(lspci | grep -i vga | awk -F ": " '{print $2}')
+			gpu=$(lspci | grep -i vga | awk -F ": " '{print $2}') 
 			;;
 		*intel*)
 			gpu="intel"
@@ -3070,36 +3072,6 @@ asciiText () {
 "${c2} .\`                                 \`/%s")
 		;;
 
-		"ArcoLinux")
-			if [[ "$no_color" != "1" ]]; then
-				c1=$(getColor 'light blue') # Light
-				c2=$(getColor 'white') # Dark
-			fi
-			if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; c2="${my_lcolor}"; fi
-			startline="1"
-			logowidth="41"
-			fulloutput=(
-"${c1}                  ..                 %s"
-"${c1}                 .oo                 %s"
-"${c1}                .oooo                %s"
-"${c1}               .oooooo               %s"
-"${c1}              .oooooooo              %s"
-"${c1}             .oooooooooo             %s"
-"${c1}            .oooooooooooo            %s"
-"${c1}           .oooooarcoooooo           %s"
-"${c1}          .ooooooo--ooooooo          %s"
-"${c1}         .ooooooo-  .ooooooo         %s"
-"${c1}        .oooooo-     .ooooooo        %s"
-"${c1}       .oooooo-       .ooooooo       %s"
-"${c1}      .oooooo-         .ooooooo      %s"
-"${c1}     .oooooo-           .ooooooo     %s"
-"${c1}    .oooooo-   ${c2}.ooooooooooooooooo.${c1}    %s"
-"${c1}   .oooooo-      ${c2}.-ooooooooooooooo.${c1}  %s"
-"${c1}  .oooooo-             ${c2}.ooooooooooo.${c1} %s"
-"${c1} .oooooo-                 ${c2}.-oooooooo.${c1}%s"
-"${c1}.oooooo-                     ${c2}.ooooooo.${c1}%s")
-        ;;
-
 		"Artix Linux")
 			if [[ "$no_color" != "1" ]]; then
 				c1=$(getColor 'cyan')
@@ -3177,6 +3149,38 @@ asciiText () {
 "${c4}                                  %s")
 			;;
 
+		"ArcoLinux")
+			if [[ "$no_color" != "0" ]]; then
+				c1=$(getColor 'arco_blue') # dark
+				c2=$(getColor 'white') # light
+			fi
+			if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; c2="${my_lcolor}"; fi
+			startline="1"
+			logowidth="41"
+			fulloutput=(
+
+"${c1}                    /-                   "
+"${c1}                   ooo:                  %s"     
+"${c1}                  yoooo/                 %s"
+"${c1}                 yooooooo                %s"
+"${c1}                yooooooooo               %s" 
+"${c1}               yooooooooooo              %s"
+"${c1}             .yooooooooooooo             %s"
+"${c1}            .oooooooooooooooo            %s"
+"${c1}           .oooooooarcoooooooo           %s"
+"${c1}          .ooooooooo-oooooooooo          %s"   
+"${c1}         .ooooooooo-  oooooooooo         %s"
+"${c1}        :ooooooooo.    :ooooooooo        %s"
+"${c1}       :ooooooooo.      :ooooooooo       %s"
+"${c1}      :oooarcooo         .oooarcooo      %s"  
+"${c1}     :ooooooooy           .ooooooooo     %s" 
+"${c1}    :ooooooooo   ${c2}/ooooooooooooooooooo${c1}    %s"
+"${c1}   :ooooooooo      ${c2}.-ooooooooooooooooo.${c1}  %s"   
+"${c1}  ooooooooo-             ${c2}-ooooooooooooo.${c1} %s"    
+"${c1} ooooooooo-                 ${c2}.-oooooooooo.${c1}%s"   
+"${c1}ooooooooo.                     ${c2}-ooooooooo${c1}%s")
+		;;
+		
 		"Mint")
 			if [[ "$no_color" != "1" ]]; then
 				c1=$(getColor 'white') # White