From b7e5ae3c9934620493b5657d9d8cbf16207c9522 Mon Sep 17 00:00:00 2001 From: Ava Gailliot Date: Thu, 17 Jul 2014 13:51:45 -0400 Subject: [PATCH 1/3] Update LinuxHardwareDetection Added doubles quote to prevent globbing and word splitting --- LinuxHardwareDetection | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/LinuxHardwareDetection b/LinuxHardwareDetection index 1647d4b..cac96dd 100755 --- a/LinuxHardwareDetection +++ b/LinuxHardwareDetection @@ -17,10 +17,6 @@ fi #######GLOBALVARS####### export log=/$HOME/Desktop/linux-check.log -######################## -date >> $log -echo -e "\nSystem Report\n------------------" >> $log - #######FUNCTIONS####### checkRAM(){ RAM=$(free -m | awk '/^Mem:/{print $2}') @@ -57,7 +53,7 @@ getHardInfo(){ audio=$(lspci | cut -f2- -d ' ' | awk '/[Aa]udio/' ) echo -e "${serial}\n\nCPU:\n${processor}\n\n${drives}\nOptical drives: ${opticals}\n\nUSB ports:\n${usb}\n\n${network}\n${graphics}\n${audio}\n" - + } getSoftInfo(){ @@ -68,14 +64,15 @@ getSoftInfo(){ } #######EXECUTION####### - +date >> "{"{$log}"}" +echo -e "\nSystem Report\n------------------" >> "{$log}" echo -e "\nGenerating system report..." -checkRAM >> $log 2>&1 +checkRAM >> "{$log}" 2>&1 echo "Checking devices..." -checkDev >> $log 2>&1 +checkDev >> "{$log}" 2>&1 echo "Checking avalible hardware devices..." -getHardInfo >> $log 2>&1 +getHardInfo >> "{$log}" 2>&1 echo "Checking software configuration..." -getSoftInfo >> $log 2>&1 +getSoftInfo >> "{$log}" 2>&1 echo -e "All Finished! Check ${log} for details.\n" -cat $log +cat "{$log}" From 7f81f007807a954dcae3098c78a69b670355194e Mon Sep 17 00:00:00 2001 From: Ava Gailliot Date: Thu, 17 Jul 2014 13:52:34 -0400 Subject: [PATCH 2/3] Update LinuxHardwareDetection Added double quotes to prevent globbing and word splitting --- LinuxHardwareDetection | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/LinuxHardwareDetection b/LinuxHardwareDetection index cac96dd..699534b 100755 --- a/LinuxHardwareDetection +++ b/LinuxHardwareDetection @@ -64,7 +64,7 @@ getSoftInfo(){ } #######EXECUTION####### -date >> "{"{$log}"}" +date >> "{$log}" echo -e "\nSystem Report\n------------------" >> "{$log}" echo -e "\nGenerating system report..." checkRAM >> "{$log}" 2>&1 From 013719ed98ee4676478bb5fb09b5ffe57c19a846 Mon Sep 17 00:00:00 2001 From: Ava Gailliot Date: Thu, 11 Sep 2014 14:28:58 -0400 Subject: [PATCH 3/3] Changed variable $i to $drive for more meaning for drive in "${drives[@]}" --- LinuxHardwareDetection | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/LinuxHardwareDetection b/LinuxHardwareDetection index 699534b..5d17688 100755 --- a/LinuxHardwareDetection +++ b/LinuxHardwareDetection @@ -30,12 +30,12 @@ checkRAM(){ checkDev(){ echo -e "Present Devices\n-------------------" drives=( '/dev/cd*' '/dev/dvd*' '/dev/usb*' ) - for i in "${drives[@]}" + for drive in "${drives[@]}" do if ls $i 1>/dev/null - then echo "${i}: Present" + then echo "${drive}: Present" else - echo "${i}: Not present" + echo "${drive}: Not present" fi done }