Changed to maximum of 80 chars/line

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@904 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 18 insertions, 16 deletions

diff --git a/virtualization/menulist-creator b/virtualization/menulist-creator
index 4351e59b..bf2eb607 100755
--- a/virtualization/menulist-creator
+++ b/virtualization/menulist-creator
@@ -23,11 +23,6 @@
 # Just needed if vmdir is somewhere else
 vmdir="." && cd ${vmdir}
 
-# File for dektopentrys
-#TODO: where to put? temporary test file, we should delete it or move it
-# later, else there isnt a valid entryfile till this script is finished
-desktopentry="${vmdir}/desktopentrys"
-
 # template for runvmware
 templatevmware="${vmdir}/templates/runvmware-v2"
 
@@ -121,13 +116,15 @@ for xml in *.xml;do
     
    
   # get short image description
-  short_description=$(grep "short_description param=\"" ${xml}.utf | sed -e "s/&.*;/; /g" | awk -F "\"" '{print $2}')
+  short_description=$(grep "short_description param=\"" ${xml}.utf |
+          sed -e "s/&.*;/; /g" | awk -F "\"" '{print $2}')
   # if ${short_description} not defined use ${image}
   short_description=${short_description:-"${image}"}
  
 
   # Get the long image description
-  long_description=$(grep "long_description param=\"" ${xml}.utf | sed -e "s/&.*;/; /g" | awk -F "\"" '{print $2}')
+  long_description=$(grep "long_description param=\"" ${xml}.utf |
+          sed -e "s/&.*;/; /g" | awk -F "\"" '{print $2}')
 
 
   # Informations if we need for XDM
@@ -167,7 +164,8 @@ for xml in *.xml;do
     fi
     # ... remove startscript and xdmsessions if it isn't active.
     if [ ${active} -ne 1 ]; then
-      if [ -f ${vmdir}/runscripts/${i}/${image}.vmware -o runscripts/${i}/${image}.virtualbox ]; then
+      if [ -f ${vmdir}/runscripts/${i}/${image}.vmware \
+           -o -f runscripts/${i}/${image}.virtualbox ]; then
         rm -rf ${vmdir}/runscripts/${i}/${image}.*
         rm -rf ${vmdir}/xdmsessions/${i}/${image}.desktop
       fi
@@ -181,14 +179,18 @@ for xml in *.xml;do
       echo -e "\nCreating runfiles for ${image} and pool ${i}\n"
       # create the desktopentry
       #TODO: change it with < EOF, >> isnt nice for so much lines
-      echo "Desktop entry for ${image}" >> ${vmdir}/xdmsessions/${i}/${image}.desktop
-      echo "[Desktop Entry]" >> ${vmdir}/xdmsessions/${i}/${image}.desktop
-      echo "X-SuSE-translate=true" >> ${vmdir}/xdmsessions/${i}/${image}.desktop
+      echo "Desktop entry for ${image}" > \ 
+                ${vmdir}/xdmsessions/${i}/${image}.desktop
+      echo "[Desktop Entry]" > ${vmdir}/xdmsessions/${i}/${image}.desktop
+      echo "X-SuSE-translate=true" >> \
+                ${vmdir}/xdmsessions/${i}/${image}.desktop
       echo "Encoding=UTF-8" >> ${vmdir}/xdmsessions/${i}/${image}.desktop
       echo "Type=XSession" >> ${vmdir}/xdmsessions/${i}/${image}.desktop
       #TODO: Fix path
-      echo "Exec=/path/to/the/execfile/${image}" >> ${vmdir}/xdmsessions/${i}/${image}.desktop
-      echo "Name=${short_description}" >> ${vmdir}/xdmsessions/${i}/${image}.desktop
+      echo "Exec=/path/to/the/execfile/${image}" >> \
+                ${vmdir}/xdmsessions/${i}/${image}.desktop
+      echo "Name=${short_description}" >> \
+                ${vmdir}/xdmsessions/${i}/${image}.desktop
       echo "Comment=${comment}" >> ${vmdir}/xdmsessions/${i}/${image}.desktop
       #TODO: I dont like SLXGrp as variable herein, why we need it here?
       #echo "SLXGrp=${pools}" >> ${vmdir}/xdmsessions/${i}/${image}.desktop
@@ -218,6 +220,5 @@ for xml in *.xml;do
 
 done
 
-
 # Delete all .utf files, we dont need them anymore
 rm -f "*.xml.utf"
diff --git a/virtualization/templates/runvmware-v2 b/virtualization/templates/runvmware-v2
index 33d345fd..e3e9e6b2 100644
--- a/virtualization/templates/runvmware-v2
+++ b/virtualization/templates/runvmware-v2
@@ -442,8 +442,9 @@ fi
 
 
 ## Write all results to logfile
-writelog "finished\nResults:\n\tMAC:\t\t00:50:56:0D:${mac}\n\tMem:\t\t${mem} MB
-  \tMax. res.:\t${xres}x${yres}\n\t\tCD-ROM_1:\t${cdr_1}\n\tCD-ROM_2:\t${cdr_2}\n"
+writelog "finished\nResults:\n\tMAC:\t\t00:50:56:0D:${mac}\n\tMem:\t\t
+  ${mem} MB \tMax. res.:\t${xres}x${yres}\n\t\tCD-ROM_1:\t${cdr_1}\n\t
+  CD-ROM_2:\t${cdr_2}\n"
 writelog "finished\nResults:\n\tDiskfile:\t${diskfile}\n\tDisktype:\t${hddrv}
   \tVMostype:\t${vmostype}\n\tDisplayname:\t${displayname}\n"