Revert "ref RobertLucian#2 : hotfix - removed sudoes from all .sh"

This reverts commit e347d91.

Author: RobertLucian

functions_library.sh

@@ -1,7 +1,7 @@
 ##############################################################
 ##############################################################
-#
-# A SERIES OF HELPER FUNCTIONS TO HELP OUT IN
+# 
+# A SERIES OF HELPER FUNCTIONS TO HELP OUT IN 
 # HANDLING SCRIPTS THAT ARE GROWING IN COMPLEXITY
 #
 ##############################################################
@@ -41,17 +41,17 @@ feedback() {
 change_branch() {
   # first and only parameter is the branch to checkout
 
-  # -z tests for zero length.
-    if [ -z ${1+x} ]; then
-        echo "Working from main branch.";
-    else
+  # -z tests for zero length. 
+    if [ -z ${1+x} ]; then 
+        echo "Working from main branch."; 
+    else 
         echo "Working from $1 branch";
         # sudo git checkout -b $BRANCH
         # the -b creates a branch if it doesn't exist
         # this leads to a fatal error msg being displayed to the user
         # is there any case where we can to create the branch here???
         # https://github.com/tldr-pages/tldr/blob/master/pages/common/git-checkout.md
-        git checkout $1
+        sudo git checkout $1
     fi
 }
 
@@ -61,12 +61,12 @@ change_branch() {
 #
 #########################################################################
 delete_line_from_file() {
-  # first parameter is the string to be matched
+  # first parameter is the string to be matched 
   # the lines that contain that string will get deleted
   # second parameter is the filename
   if [ -f $2 ]
   then
-    sed -i "/$1/d" $2
+    sudo sed -i "/$1/d" $2
   fi
 }
 
@@ -77,7 +77,7 @@ insert_before_line_in_file() {
 
   if [ -f $3 ]
   then
-    sed -i "/$2/i $1" $3
+    sudo sed -i "/$2/i $1" $3
   fi
 }
 
@@ -87,7 +87,7 @@ add_line_to_end_of_file() {
   if [ -f $2 ]
   then
     echo "$1" >> "$2"
-  fi
+  fi 
 }
 
 replace_first_this_with_that_in_file() {
@@ -97,7 +97,7 @@ replace_first_this_with_that_in_file() {
   # third parameter is the filename
   if grep -q "$1" $3
   then
-     sed -i "s/$1/$2/" "$3"
+    sudo sed -i "s/$1/$2/" "$3"
      return 0
   else
       #feedback "Line - $1 not found"
@@ -114,7 +114,7 @@ replace_all_this_with_that_in_file(){
   #feedback "replacing $1 with $2 in $3"
   if file_exists "$3"
   then
-    sed -i "s/$1/$2/g" "$3"
+    sudo sed -i "s/$1/$2/g" "$3"
     return 0
   else
     return 1
@@ -187,7 +187,7 @@ delete_file (){
   # One parameter only: the file to delete
   if file_exists "$1"
   then
-    rm "$1"
+    sudo rm "$1"
   fi
 }
 
@@ -214,7 +214,7 @@ wget_file() {
 create_folder(){
   if ! folder_exists "$1"
   then
-    mkdir "$1"
+    sudo mkdir "$1"
   fi
 }
 
@@ -233,6 +233,6 @@ folder_exists(){
 delete_folder(){
   if folder_exists "$1"
   then
-    rm -r "$1"
+    sudo rm -r "$1"
   fi
 }

install_avrdude.sh

@@ -5,7 +5,7 @@ create_avrdude_folder(){
     AVRDUDE_DIR='/home/pi/Dexter/lib/AVRDUDE'
     if [ -d "$AVRDUDE_DIR" ]; then
         echo $AVRDUDE_DIR" Found!"
-    else
+    else 
         DIRECTORY='/home/pi/Dexter'
         if [ -d "$DIRECTORY" ]; then
             # Will enter here if $DIRECTORY exists, even if it contains spaces
@@ -23,7 +23,7 @@ create_avrdude_folder(){
             echo "creating "$DIRECTORY
             mkdir $DIRECTORY
         fi
-
+        
         pushd $DIRECTORY
         git clone https://github.com/DexterInd/AVRDUDE.git
         popd
@@ -35,36 +35,36 @@ install_avrdude(){
     FILENAME=tmpfile.txt
     AVRDUDE_VER=5.10
     avrdude -v &> $FILENAME
-
+    
     #Only install avrdude 5.1 if it does not exist
-    if grep -q $AVRDUDE_VER $FILENAME
+    if grep -q $AVRDUDE_VER $FILENAME 
     then
         echo "avrdude" $AVRDUDE_VER "Found"
     else
         echo "avrdude" $AVRDUDE_VER "Not Found,Installing avrdude now"
         create_avrdude_folder
-
+        
         ##########################################
         #Installing AVRDUDE
         ##########################################
         pushd /home/pi/Dexter/lib/AVRDUDE/avrdude
-
+        
         # Install the avrdude deb package
         # No need to wget since files should be there in the avrdude folder
         # wget https://github.com/DexterInd/AVRDUDE/raw/master/avrdude/avrdude_5.10-4_armhf.deb
-        dpkg -i avrdude_5.10-4_armhf.deb
-        chmod 4755 /usr/bin/avrdude
-
-        # Setup config files
+        sudo dpkg -i avrdude_5.10-4_armhf.deb 
+        sudo chmod 4755 /usr/bin/avrdude
+        
+        # Setup config files 
         # wget http://project-downloads.drogon.net/gertboard/setup.sh
         chmod +x setup.sh
-        ./setup.sh  
-
+        sudo ./setup.sh  
+        
         # pushd /etc/minicom
         # sudo wget http://project-downloads.drogon.net/gertboard/minirc.ama0
         # sudo sed -i '/Exec=arduino/c\Exec=sudo arduino' /usr/share/applications/arduino.desktop
         echo " "
         popd
     fi
-    rm $FILENAME
+    rm $FILENAME   
 }

update_wiringpi.sh

@@ -8,23 +8,23 @@ LIB=lib
 
 # Check if WiringPi Installed and has the latest version.  If it does, skip the step.
 # Gets the version of wiringPi installed
-version=`gpio -v`
+version=`gpio -v`       
 
 # Parses the version to get the number
-set -- $version
+set -- $version         
 
 # Gets the third word parsed out of the first line of gpio -v returned.
 # Should be 2.36
-WIRINGVERSIONDEC=$3
+WIRINGVERSIONDEC=$3     
 
 # Store to temp file
-echo $WIRINGVERSIONDEC >> tmpversion
+echo $WIRINGVERSIONDEC >> tmpversion    
 
 # Remove decimals
-VERSION=$(sed 's/\.//g' tmpversion)
+VERSION=$(sed 's/\.//g' tmpversion)     
 
 # Remove the temp file
-delete_file tmpversion
+delete_file tmpversion                           
 
 feedback "wiringPi VERSION is $VERSION"
 if [ $VERSION -eq '236' ]; then
@@ -38,13 +38,13 @@ else
 
     # Change directories to Dexter/lib
     cd $PIHOME/$DEXTER/$LIB
-
-    delete_folder wiringPi
+    
+    delete_folder wiringPi  
     # Install wiringPi
     git clone https://github.com/DexterInd/wiringPi/  # Clone directories to Dexter.
     cd wiringPi
-    chmod +x ./build
-    ./build
+    sudo chmod +x ./build
+    sudo ./build
     feedback "wiringPi Installed"
 fi
 # End check if WiringPi installed