Reorga of functions

moved all functions into files
Redid RAM to be more useable

test.sh

@@ -5,87 +5,31 @@ DIR="${BASH_SOURCE%/*}"
 DESKTOP_PATH=$(xdg-user-dir DESKTOP)
 OUT="$DESKTOP_PATH/device_info.txt"
 source drives.sh
+source RAM.sh
+source camera.sh
+source speaker.sh
+source wifi.sh
+source lan.sh
+source screen.sh
+source battery.sh
+source model.sh
 
 if [[ ! -d "$DIR" ]]; then DIR="$PWD"; fi
 
-get_cpu_model () {
-	CPUModel=$(cat /proc/cpuinfo | grep "model name" | head -1 | cut -d: -f2- |  sed 's/^[[:space:]]*//' )
-}
 
-get_model () {
-MODEL=$(cat /sys/class/dmi/id/product_name)
-}
+LAN_CABLE
 
-get_RAM () {
-LANGUAGE="${LC_MESSAGES:-$LANG}"
-
-
-if [[ "$LANGUAGE" == de* ]]; then
-    TOTAL_MEM=$(free -g | grep Speicher: | awk '{print $2}')
-elif [[ "$LANGUAGE" == en* ]]; then
-    TOTAL_MEM=$(free -g | awk '/^Mem:/ {print $2}')
-fi
-
-}
-
-. "$DIR/lan.sh"
-get_cpu_model
-get_model
-get_RAM
-sudo hostnamectl set-hostname "csr-$MODEL"
-clear
 echo -e "$(date -I)" >"$OUT"
-echo -e "CPU:\t$CPUModel" >>"$OUT"
-echo -e "Model:\t$MODEL"  >>"$OUT"
-echo -e "RAM:\t$TOTAL_MEM GB" >> "$OUT"
-
-. "$DIR/camera.sh"
-retval=$?
-if [ "$retval" == 0 ]
-then
-	echo -e "Kamera:\t Ja"  >>"$OUT"
-else
-	echo -e "Kamera:\t Nein"  >>"$OUT"
-fi
-
-
-. "$DIR/speaker.sh"
-retval=$?
-if [ "$retval" == 0 ]
-then
-	echo -e "Speaker:\t Ja"  >>"$OUT"
-else
-	echo -e "Speaker:\t Nein"  >>"$OUT"
-fi
-
-. "$DIR/wifi.sh"
-retval=$?
-if [ "$retval" == 0 ] ; then
-	echo -e "WIFI:\t Ja"  >>"$OUT"
-else
-	echo -e "WIFI:\t Nein"  >>"$OUT"
-fi
-
-. "$DIR/screen.sh"
-
-in_retval=$?
-if [ "$in_retval" != 0 ]
-then
-	echo -e "Screen:\t $in_retval"  >>"$OUT"
-else
-	echo -e "Screen check failed"  >>"$OUT"
-fi
-
-#clear
-. "$DIR/battery.sh"
-retval=$?
-if [ "$retval" == 0 ];then
-	echo -e "AKKU:\t Ja"  >>"$OUT"
-else
-	echo -e "AKKU:\t Nein"  >>"$OUT"
-fi
 
+MODEL $OUT
+CPU $OUT
+CAMERA $OUT
+SPEAKER $OUT
+WIFI $OUT
+SCREEN $OUT
+BATTERY $OUT
 drives $OUT
+RAM $OUT
 
 cat "$OUT"