Magellan Linux

Diff of /mcore-src/trunk/mcore-tools/src/include/daemon.global.class.in

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 2077 by niro, Fri May 10 10:46:47 2013 UTC revision 2139 by niro, Fri Jan 10 10:23:50 2014 UTC
# Line 1  Line 1 
1  # $Id$  # $Id$
2    
3  # loads client classes from $MCLIBDIR  # loads client classes from $MCORE_LIBDIR
4  load_client_classes()  load_client_classes()
5  {  {
6   local i   local i
7    
8   # client specific   # client specific
9   for i in $(find ${MCLIBDIR}/include -type f -name \*.client.class)   for i in $(find ${MCORE_LIBDIR}/include -type f -name \*.client.class)
10   do   do
11   source ${i} || eecho "error loading ${i}"   source ${i} || eecho "error loading ${i}"
12   done   done
# Line 226  verify_requirements() Line 226  verify_requirements()
226   # show missing and set the right retval   # show missing and set the right retval
227   if [[ -z ${missing} ]]   if [[ -z ${missing} ]]
228   then   then
229   rvecho "${sorted}"   # do not escape, or CRLFS get printed to screen too
230     rvecho ${sorted}
231   return 0   return 0
232   else   else
233   for req in ${sorted}   for req in ${sorted}
# Line 234  verify_requirements() Line 235  verify_requirements()
235   if no_duplicate "${missing}" "$req"   if no_duplicate "${missing}" "$req"
236   then   then
237   # print normal   # print normal
238   rvecho -n " ${req}"   rvecho -n "${req} "
239   else   else
240   # print missing   # print missing
241   eecho -n " ${req}"   eecho -n "${req} "
242   fi   fi
243   done   done
244     # print CRLF
245     echo
246   return 1   return 1
247   fi   fi
248  }  }
# Line 411  list_files_in_directory() Line 414  list_files_in_directory()
414   -mindepth) shift; opts+=" -mindepth $1" ;;   -mindepth) shift; opts+=" -mindepth $1" ;;
415   -maxdepth) shift; opts+=" -maxdepth $1" ;;   -maxdepth) shift; opts+=" -maxdepth $1" ;;
416   -type) shift; type="$1" ;;   -type) shift; type="$1" ;;
417   -name) shift; opts+="-name $1" ;;   -name) shift; opts+=" -name $1" ;;
418   '') continue ;;   '') continue ;;
419   *) path="$1" ;;   *) path="$1" ;;
420   esac   esac
# Line 433  list_files_in_directory() Line 436  list_files_in_directory()
436   # default to files   # default to files
437   [[ -z ${type} ]] && type=f   [[ -z ${type} ]] && type=f
438    
439   for i in $(find ${path} ${opts} -type ${type} -print '%f\n' | sort)   for i in $(find ${path} ${opts} -type ${type} -printf '%f\n' | sort)
440   do   do
441   if [[ -z ${retval} ]]   if [[ -z ${retval} ]]
442   then   then
# Line 448  list_files_in_directory() Line 451  list_files_in_directory()
451    
452  print_version()  print_version()
453  {  {
454   echo "mcored-$(<${MCLIBDIR}/VERSION)"   echo "mcored-$(<${MCORE_LIBDIR}/VERSION)"
455  }  }
456    
457    system_chroot()
458    {
459     local cmd="$@"
460     if [[ -z ${MROOT} ]]
461     then
462     echo "system_chroot(): \$MROOT was not set, doing nothing!"
463     return 1
464     fi
465     if [ ! -d ${MROOT} ]
466     then
467     eecho "system_chroot(): MROOT='${MROOT}' does not exist."
468     return 1
469     fi
470    
471     chroot ${MROOT} ${cmd}
472    }
473    

Legend:
Removed from v.2077  
changed lines
  Added in v.2139