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 2044 by niro, Wed May 8 11:04:43 2013 UTC revision 2091 by niro, Mon May 13 07:06:33 2013 UTC
# Line 411  list_files_in_directory() Line 411  list_files_in_directory()
411   -mindepth) shift; opts+=" -mindepth $1" ;;   -mindepth) shift; opts+=" -mindepth $1" ;;
412   -maxdepth) shift; opts+=" -maxdepth $1" ;;   -maxdepth) shift; opts+=" -maxdepth $1" ;;
413   -type) shift; type="$1" ;;   -type) shift; type="$1" ;;
414     -name) shift; opts+=" -name $1" ;;
415   '') continue ;;   '') continue ;;
416   *) path="$1" ;;   *) path="$1" ;;
417   esac   esac
# Line 432  list_files_in_directory() Line 433  list_files_in_directory()
433   # default to files   # default to files
434   [[ -z ${type} ]] && type=f   [[ -z ${type} ]] && type=f
435    
436   for i in $(find ${path} ${opts} -type ${type} | sort)   for i in $(find ${path} ${opts} -type ${type} -printf '%f\n' | sort)
437   do   do
438   if [[ -z ${retval} ]]   if [[ -z ${retval} ]]
439   then   then
440   retval="$(basename ${i})"   retval="${i}"
441   else   else
442   retval="${retval} $(basename ${i})"   retval+=" ${i}"
443   fi   fi
444   done   done
445    
446   rvecho "${retval}"   rvecho "${retval}"
447  }  }
448    
449    print_version()
450    {
451     echo "mcored-$(<${MCLIBDIR}/VERSION)"
452    }
453    
454    system_chroot()
455    {
456     local cmd="$@"
457     if [[ -z ${MROOT} ]]
458     then
459     echo "system_chroot(): \$MROOT was not set, doing nothing!"
460     return 1
461     fi
462     if [ ! -d ${MROOT} ]
463     then
464     eecho "system_chroot(): MROOT='${MROOT}' does not exist."
465     return 1
466     fi
467    
468     chroot ${MROOT} ${cmd}
469    }
470    

Legend:
Removed from v.2044  
changed lines
  Added in v.2091