Merge pull request ruanyf#30 from 6gk/master

simplifications

Author: ruanyf

scripts/addition.sh

@@ -1,8 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-echo 'Enter the First Number :'
-read a
-echo 'Enter the Second Number :'
-read b
-x=$(expr "$a" + "$b")
-echo $a + $b = $x
+echo -n 'Enter the First Number: '
+read -r a
+echo -n 'Enter the Second Number: '
+read -r b
+echo "$a + $b = $((a+b))"

scripts/affect.sh

@@ -1,9 +1,9 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 arr=('-' '\' '|' '/')
 while true; do
 	for c in "${arr[@]}"; do
-		printf "\r %c " $c
+		echo -en "\r $c "
 		sleep .5
 	done
 done

scripts/archive-and-encrypt.sh

@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
 name=$1
 path=$2
-tar -czvf $name.tar.gz $path 
-gpg -c $name.tar.gz
-rm -rf $name.tar.gz
+tar -czvf "$name.tar.gz" "$path"
+gpg -c "$name.tar.gz"
+rm -rf "$name.tar.gz"

scripts/armstrong.sh

@@ -1,15 +1,15 @@
-#!/bin/bash
-echo "Enter A Number"
-read n
+#!/usr/bin/env bash
+echo -n "Enter A Number: "
+read -r n
 arm=0
 temp=$n
-while [ $n -ne 0 ]; do
-	r=$(expr $n % 10)
-	arm=$(expr $arm + $r \* $r \* $r)
-	n=$(expr $n / 10)
+while [ "$n" -ne 0 ]; do
+	r=$((n % 10))
+	arm=$((arm + r * r * r))
+	n=$((n / 10))
 done
 echo $arm
-if [ $arm -eq $temp ]; then
+if [ $arm -eq "$temp" ]; then
 	echo "Armstrong"
 else
 	echo "Not Armstrong"

scripts/binary2decimal.sh

@@ -1,20 +1,19 @@
-#!/bin/bash
-echo "Enter a number :"
-read Binary
-if [ $Binary -eq 0 ]; then
+#!/usr/bin/env bash
+echo -n "Enter a number: "
+read -r binary
+if [ "$binary" -eq 0 ]; then
 	echo "Enter a valid number "
 	return
 else
-	while [ $Binary -ne 0 ]; do
-		Bnumber=$Binary
-		Decimal=0
+	while [ "$binary" -ne 0 ]; do
+		decimal=0
 		power=1
-		while [ $Binary -ne 0 ]; do
-			rem=$(expr $Binary % 10)
-			Decimal=$((Decimal + (rem * power)))
+		while [ "$binary" -ne 0 ]; do
+			rem=$((binary % 10))
+			decimal=$((decimal + (rem * power)))
 			power=$((power * 2))
-			Binary=$(expr $Binary / 10)
+			binary=$((binary / 10))
 		done
-		echo " $Decimal"
+		echo " $decimal"
 	done
 fi

scripts/color.sh

@@ -1,20 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-DARKGRAY='\033[1;30m'
-RED='\033[0;31m'
-LIGHTRED='\033[1;31m'
-GREEN='\033[0;32m'
-YELLOW='\033[1;33m'
-BLUE='\033[0;34m'
-PURPLE='\033[0;35m'
-LIGHTPURPLE='\033[1;35m'
-CYAN='\033[0;36m'
-WHITE='\033[1;37m'
-DEFAULT='\033[0m'
-
-COLORS=($DARKGRAY $RED $LIGHTRED $GREEN $YELLOW $BLUE $PURPLE $LIGHTPURPLE $CYAN $WHITE )
-
-for c in "${COLORS[@]}";do
-    printf "\r $c LOVE $DEFAULT "
-    sleep 1
-done
+for c in 90 31 91 32 33 34 35 95 36 97; do
+	echo -en "\r \e[${c}m LOVE \e[0m "
+	sleep 1
+done

scripts/convertlowercase.sh

@@ -1,11 +1,11 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-echo -n "Enter File Name : "
-read fileName
+echo -n "Enter File Name: "
+read -r file
 
-if [ ! -f $fileName ]; then
-	echo "Filename $fileName does not exists"
+if [ ! -f "$file" ]; then
+	echo "Filename $file does not exists"
 	exit 1
 fi
 
-tr '[A-Z]' '[a-z]' <$fileName >>small.txt
+tr '[:upper:]' '[:lower:]' < "$file" >> small.txt

scripts/count-lines.sh

@@ -1,9 +1,3 @@
 #!/usr/bin/env bash
 
-for F in *
-do
-	if [[ -f $F ]]
-	then
-		echo $F: $(cat $F | wc -l)
-	fi
-done
+wc -l ./*

scripts/dec2hex.sh

@@ -1,3 +1,2 @@
-#!/bin/bash
-
-printf "0x%x\n" $1
+#!/usr/bin/env bash
+printf "0x%x\n" "$1"

scripts/decimal2binary.sh

@@ -1,7 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 for ((i = 32; i >= 0; i--)); do
-	r=$((2 ** $i))
+	r=$((2 ** i))
 	Probablity+=($r)
 done
 
@@ -11,7 +11,7 @@ done
 }
 
 echo -en "Decimal\t\tBinary\n"
-for input_int in $@; do
+for input_int; do
 	s=0
 	test ${#input_int} -gt 11 && {
 		echo "Support Upto 10 Digit number :: skiping \"$input_int\""
@@ -22,12 +22,12 @@ for input_int in $@; do
 
 	for n in ${Probablity[@]}; do
 
-		if [[ $input_int -lt ${n} ]]; then
+		if [[ $input_int -lt $n ]]; then
 			[[ $s == 1 ]] && printf "%d" 0
 		else
-			printf "%d" 1
+			echo -n 1
 			s=1
-			input_int=$(($input_int - ${n}))
+			input_int=$((input_int - n))
 		fi
 	done
 	echo -e