Skip to content

Commit a8b4dc9

Browse files
committed
Remove trailing whitespaces
1 parent 5e4f344 commit a8b4dc9

File tree

2 files changed

+33
-33
lines changed

2 files changed

+33
-33
lines changed

TODO

+7-7
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
**##** *#* TO DO LIST *#* **##**
22

3-
This small list will be the central place where I will list ideas and
3+
This small list will be the central place where I will list ideas and
44
things I want to happen with screenFetch.
55

66
Obvious Things:
@@ -18,12 +18,12 @@ Other Things:
1818
6) Custom logos file. Source logos file with -C flag is present. -A will act normally
1919
if -C is present as well.
2020

21-
That's about it for now. If you can help with any of these, please
22-
please PLEASE let me know by emailing me at [email protected] or by
23-
stopping by SilverIRC on your favorite IRC client. The network can be
24-
accessed by pointing your IRC client to kittykatt.silverirc.com. #me0wz
25-
is my home channel. If you don't have an IRC client, head on over to
26-
http://www.silverirc.com/index.php?page=chat and that'll join
21+
That's about it for now. If you can help with any of these, please
22+
please PLEASE let me know by emailing me at [email protected] or by
23+
stopping by SilverIRC on your favorite IRC client. The network can be
24+
accessed by pointing your IRC client to kittykatt.silverirc.com. #me0wz
25+
is my home channel. If you don't have an IRC client, head on over to
26+
http://www.silverirc.com/index.php?page=chat and that'll join
2727
you to #randomz, where I can be reached as well.
2828

2929
Thank you for any help.

screenfetch-dev

+26-26
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ case $1 in
269269
--help) displayHelp; exit 0;;
270270
--version) displayVersion; exit 0;;
271271
esac
272-
272+
273273

274274
while getopts ":hsu:evVEnLNtlS:A:D:o:Bc:d:pa:" flags; do
275275
case $flags in
@@ -524,7 +524,7 @@ detectdistro () {
524524
fake_distro="${distro}"
525525
;;
526526
"GNU/Linux")
527-
if type -p crux >/dev/null 2>&1; then
527+
if type -p crux >/dev/null 2>&1; then
528528
distro="CRUX"
529529
distro_more="${distro} $(crux | awk '{print $3}')"
530530
fi
@@ -851,9 +851,9 @@ detectpkgs () {
851851
'CRUX') pkgs=$(pkginfo -i | wc -l) ;;
852852
'Lunar Linux') pkgs=$(lvu installed | wc -l) ;;
853853
'Mac OS X')
854-
if [ -d "/usr/local/bin" ]; then
854+
if [ -d "/usr/local/bin" ]; then
855855
loc_pkgs=$(ls -l /usr/local/bin/ | grep -v "\(../Cellar/\|brew\)" | wc -l)
856-
pkgs=$((${loc_pkgs} -1));
856+
pkgs=$((${loc_pkgs} -1));
857857
fi
858858

859859
if type -p port >/dev/null 2>&1; then
@@ -866,15 +866,15 @@ detectpkgs () {
866866
pkgs=$((${pkgs} + ${brew_pkgs}))
867867
fi
868868
;;
869-
'OpenBSD')
869+
'OpenBSD')
870870
pkgs=$(pkg_info | wc -l | awk '{sub(" ", "");print $1}')
871871
if type -p portmaster >/dev/null 2>&1; then
872872
ports=$(portmaster -l | grep -Eo '[0-9]+ total installed' | sed 's/ total installed//')
873873
pkgs=$((${pkgs} + ${ports}))
874874
fi
875875
;;
876876
'FreeBSD')
877-
pkgs=$(if TMPDIR=/dev/null ASSUME_ALWAYS_YES=1 PACKAGESITE=file:///nonexistent pkg info pkg >/dev/null 2>&1; then
877+
pkgs=$(if TMPDIR=/dev/null ASSUME_ALWAYS_YES=1 PACKAGESITE=file:///nonexistent pkg info pkg >/dev/null 2>&1; then
878878
pkg info | wc -l | awk '{print $1}'; else pkg_info | wc -l | awk '{sub(" ", "");print $1}'; fi)
879879
;;
880880
'Cygwin')
@@ -933,7 +933,7 @@ detectcpu () {
933933
if [ -z "$cpu" ]; then
934934
cpu=$(awk 'BEGIN{FS=":"} /Hardware/ { print $2; exit }' /proc/cpuinfo)
935935
fi
936-
if [ -z "$cpu" ]; then
936+
if [ -z "$cpu" ]; then
937937
cpu=$(awk 'BEGIN{FS=":"} /^cpu/ { gsub(/ +/," ",$2); print $2; exit}' /proc/cpuinfo | sed 's/, altivec supported//;s/^ //')
938938
if [[ $cpu =~ ^(PPC)*9.+ ]]; then
939939
model="IBM PowerPC G5 "
@@ -1043,7 +1043,7 @@ detectdisk () {
10431043
diskusage_verbose=$(sed 's/%/%%/' <<< $diskusage)
10441044
fi
10451045
verboseOut "Finding current disk usage...found as '$diskusage_verbose'"
1046-
}
1046+
}
10471047
# Disk Usage Detection - End
10481048

10491049

@@ -1057,7 +1057,7 @@ detectmem () {
10571057
wiredmem=$(vm_stat | grep wired | awk '{ print $4 }' | sed 's/\.//')
10581058
activemem=$(vm_stat | grep ' active' | awk '{ print $3 }' | sed 's/\.//')
10591059
compressedmem=$(vm_stat | grep occupied | awk '{ print $5 }' | sed 's/\.//')
1060-
usedmem=$(((${wiredmem} + ${activemem} + ${compressedmem}) * 4 / $human))
1060+
usedmem=$(((${wiredmem} + ${activemem} + ${compressedmem}) * 4 / $human))
10611061
elif [ "$distro" == "Cygwin" ]; then
10621062
total_mem=$(awk '/MemTotal/ { print $2 }' /proc/meminfo)
10631063
totalmem=$((${total_mem}/$human))
@@ -1233,7 +1233,7 @@ detectres () {
12331233

12341234
xResolution=""
12351235
len=${#width[@]}
1236-
1236+
12371237
delim=" "
12381238
for ((i=0;i<len;i++)); do
12391239
xResolution="${xResolution}${delim}${width[i]}x${height[i]}"
@@ -1661,7 +1661,7 @@ detectwmtheme () {
16611661
'dminiwm') Win_theme="Not Applicable";;
16621662
'dwm') Win_theme="Not Applicable";;
16631663
'E16') Win_theme="$(awk -F"= " '/theme.name/ {print $2}' $HOME/.e16/e_config--0.0.cfg)";;
1664-
'E17'|'Enlightenment')
1664+
'E17'|'Enlightenment')
16651665
if [ "$(which eet 2>/dev/null)" ]; then
16661666
econfig="$(eet -d $HOME/.e/e/config/standard/e.cfg config | awk '/value \"file\" string.*.edj/{ print $4 }')"
16671667
econfigend="${econfig##*/}"
@@ -2042,7 +2042,7 @@ takeShot () {
20422042
if [[ -z $screenCommand ]]; then
20432043
if [[ "${upload}" == "1" ]]; then
20442044
shotfiles[1]=${shotfile}
2045-
if [ "$distro" == "Mac OS X" ]; then
2045+
if [ "$distro" == "Mac OS X" ]; then
20462046
displays="$(system_profiler SPDisplaysDataType | grep 'Resolution:' | wc -l | tr -d ' ')"
20472047
for (( i=2; i<=$displays; i++))
20482048
do
@@ -2101,14 +2101,14 @@ takeShot () {
21012101
scp -qo ConnectTimeout="${scptimeout}" "${shotfiles[@]}" "${serveraddr}:${serverdir}"
21022102
desturl="${baseurl}/${shotfile}"
21032103
;;
2104-
esac
2104+
esac
21052105
printf "your screenshot can be viewed at ${desturl}\n"
21062106
else
21072107
errorOut "ERROR: Problem saving screenshot to ${shotfiles[@]}"
21082108
fi
21092109
else
21102110
shotfiles[1]=${shotfile}
2111-
if [ "$distro" == "Mac OS X" ]; then
2111+
if [ "$distro" == "Mac OS X" ]; then
21122112
displays="$(system_profiler SPDisplaysDataType | grep 'Resolution:' | wc -l | tr -d ' ')"
21132113
for (( i=2; i<=$displays; i++))
21142114
do
@@ -3482,7 +3482,7 @@ asciiText () {
34823482
"${c1} .'"
34833483
"${c1} .")
34843484
;;
3485-
3485+
34863486
"Kali Linux")
34873487
if [[ "$no_color" != "1" ]]; then
34883488
c1=$(getColor 'light blue') # White
@@ -3543,9 +3543,9 @@ asciiText () {
35433543

35443544
"KaOS")
35453545
if [[ "$no_color" != "1" ]]; then
3546-
c1=$(getColor 'light blue')
3547-
c2=$(getColor 'light grey')
3548-
c3=$(getColor 'red')
3546+
c1=$(getColor 'light blue')
3547+
c2=$(getColor 'light grey')
3548+
c3=$(getColor 'red')
35493549
fi
35503550
if [ -n "${my_lcolor}" ]; then c1="${my_lcolor}"; c2="${my_lcolor}"; fi
35513551
startline="0"
@@ -3976,24 +3976,24 @@ infoDisplay () {
39763976
if [[ "${display[@]}" =~ "gtk" ]]; then
39773977
if [ "$distro" == "Mac OS X" ]; then
39783978
if [[ "$gtkFont" != "Not Applicable" && "$gtkFont" != "Not Found" ]]; then
3979-
if [ -n "$gtkFont" ]; then
3979+
if [ -n "$gtkFont" ]; then
39803980
myfont=$(echo -e "$labelcolor Font:$textcolor $gtkFont"); out_array=( "${out_array[@]}" "$myfont" ); ((display_index++))
39813981
fi
39823982
fi
39833983
else
39843984
if [[ "$gtk2Theme" != "Not Applicable" && "$gtk2Theme" != "Not Found" ]]; then
3985-
if [ -n "$gtk2Theme" ]; then
3985+
if [ -n "$gtk2Theme" ]; then
39863986
mygtk2="${gtk2Theme} [GTK2]"
39873987
fi
39883988
fi
39893989
if [[ "$gtk3Theme" != "Not Applicable" && "$gtk3Theme" != "Not Found" ]]; then
3990-
if [ -n "$mygtk2" ]; then
3990+
if [ -n "$mygtk2" ]; then
39913991
mygtk3=", ${gtk3Theme} [GTK3]"
39923992
else
39933993
mygtk3="${gtk3Theme} [GTK3]"
39943994
fi
39953995
fi
3996-
if [[ "$gtk_2line" == "yes" ]]; then
3996+
if [[ "$gtk_2line" == "yes" ]]; then
39973997
mygtk2=$(echo -e "$labelcolor GTK2 Theme:$textcolor $gtk2Theme"); out_array=( "${out_array[@]}" "$mygtk2" ); ((display_index++))
39983998
mygtk3=$(echo -e "$labelcolor GTK3 Theme:$textcolor $gtk3Theme"); out_array=( "${out_array[@]}" "$mygtk3" ); ((display_index++))
39993999
else
@@ -4006,12 +4006,12 @@ infoDisplay () {
40064006
fi
40074007
fi
40084008
if [[ "$gtkIcons" != "Not Applicable" && "$gtkIcons" != "Not Found" ]]; then
4009-
if [ -n "$gtkIcons" ]; then
4009+
if [ -n "$gtkIcons" ]; then
40104010
myicons=$(echo -e "$labelcolor Icon Theme:$textcolor $gtkIcons"); out_array=( "${out_array[@]}" "$myicons" ); ((display_index++))
40114011
fi
40124012
fi
40134013
if [[ "$gtkFont" != "Not Applicable" && "$gtkFont" != "Not Found" ]]; then
4014-
if [ -n "$gtkFont" ]; then
4014+
if [ -n "$gtkFont" ]; then
40154015
myfont=$(echo -e "$labelcolor Font:$textcolor $gtkFont"); out_array=( "${out_array[@]}" "$myfont" ); ((display_index++))
40164016
fi
40174017
fi
@@ -4150,9 +4150,9 @@ for i in "${display[@]}"; do
41504150
! [[ $WM ]] && detectwm;
41514151
! [[ $Win_theme ]] && detectwmtheme;
41524152
else
4153-
if [[ "${display[*]}" =~ "$i" ]]; then
4153+
if [[ "${display[*]}" =~ "$i" ]]; then
41544154
if [[ "$errorSuppress" == "1" ]]; then detect${i} 2>/dev/null
4155-
else
4155+
else
41564156
exec 3> >(stderrOut)
41574157
detect${i} 2>&3
41584158
exec 3>&-

0 commit comments

Comments
 (0)