Magellan Linux

  • Back to homepage
    • /[smage]/branches/R11-unstable/include/mtools.sminc

    Diff of /branches/R11-unstable/include/mtools.sminc

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

    branches/magellan-next/include/mtools.sminc revision 8644 by niro, Wed Jul 27 11:18:18 2011 UTC trunk/include/mtools.sminc revision 12653 by niro, Tue Jun 26 15:38:25 2012 UTC
    # Line 169  minstalludevrule() Line 169  minstalludevrule()
    169   fi   fi
    170    
    171   # needed directory   # needed directory
    172   install -d ${BINDIR}/etc/udev/rules.d || die   install -d ${BINDIR}/lib/udev/rules.d || die
    173    
    174   # install our udev rule   # install our udev rule
    175   install -v -m 0644 -o root -g root ${file} ${BINDIR}/etc/udev/rules.d/${udevrule} || die   install -v -m 0644 -o root -g root ${file} ${BINDIR}/lib/udev/rules.d/${udevrule} || die
    176  }  }
    177    
    178  minstalludevhelper()  minstalludevhelper()
    # Line 468  minstallcron() Line 468  minstallcron()
    468    
    469    
    470  # installs logrotate configuration files  # installs logrotate configuration files
    471  # minstallpam /path/to/logrotatefile {destfilename}  # minstalllog /path/to/logrotatefile {destfilename}
    472  minstalllog()  minstalllog()
    473  {  {
    474   local logfile   local logfile
    # Line 636  mcopy() Line 636  mcopy()
    636   # recursive   # recursive
    637   if [[ $1 = -r ]] || [[ $1 = -R ]]   if [[ $1 = -r ]] || [[ $1 = -R ]]
    638   then   then
    639   opts="--recursive"   opts="-R"
    640   source="$2"   source="$2"
    641   dest="$3"   dest="$3"
    642   fi   fi
    # Line 644  mcopy() Line 644  mcopy()
    644   # recursive   # recursive
    645   if [[ $1 = -rf ]] || [[ $1 = -fr ]] || [[ $1 = -Rf ]] || [[ $1 = -fR ]]   if [[ $1 = -rf ]] || [[ $1 = -fr ]] || [[ $1 = -Rf ]] || [[ $1 = -fR ]]
    646   then   then
    647   opts="--recursive --force"   opts="-R -f"
    648     source="$2"
    649     dest="$3"
    650     fi
    651    
    652     if [[ $1 = -a ]]
    653     then
    654     opts="-a"
    655   source="$2"   source="$2"
    656   dest="$3"   dest="$3"
    657   fi   fi
    # Line 655  mcopy() Line 662  mcopy()
    662   cp -v ${opts} ${source} ${BINDIR}/${dest} || die   cp -v ${opts} ${source} ${BINDIR}/${dest} || die
    663  }  }
    664    
    665    mdelete()
    666    {
    667     local dest="$1"
    668     local opts
    669    
    670     # recursive
    671     if [[ $1 = -r ]] || [[ $1 = -R ]]
    672     then
    673     opts="-r"
    674     dest="$2"
    675     fi
    676    
    677     # recursive
    678     if [[ $1 = -rf ]] || [[ $1 = -fr ]] || [[ $1 = -Rf ]] || [[ $1 = -fR ]]
    679     then
    680     opts="-r -f"
    681     dest="$2"
    682     fi
    683    
    684     [[ -z ${dest} ]] && die "No dest given."
    685     [[ -e ${BINDIR}/${dest} ]] && die "${BINDIR}/${dest} does not exist."
    686    
    687     rm -v ${opts} ${BINDIR}/${dest} || die
    688    }
    689    
    690  mmove()  mmove()
    691  {  {
    692   local source="$1"   local source="$1"
    # Line 664  mmove() Line 696  mmove()
    696   # force   # force
    697   if [[ $1 = -f ]]   if [[ $1 = -f ]]
    698   then   then
    699   opts="--force"   opts="-f"
    700   source="$2"   source="$2"
    701   dest="$3"   dest="$3"
    702   fi   fi
    # Line 710  mchown() Line 742  mchown()
    742   # recursive   # recursive
    743   if [[ $1 = -r ]] || [[ $1 = -R ]]   if [[ $1 = -r ]] || [[ $1 = -R ]]
    744   then   then
    745   local recursive="--recursive"   local recursive="-R"
    746   local owner="$2"   local owner="$2"
    747   local path="$3"   local path="$3"
    748   fi   fi
    # Line 730  mchmod() Line 762  mchmod()
    762   # recursive   # recursive
    763   if [[ $1 = -r ]] || [[ $1 = -R ]]   if [[ $1 = -r ]] || [[ $1 = -R ]]
    764   then   then
    765   local recursive="--recursive"   local recursive="-R"
    766   local posix="$2"   local posix="$2"
    767   local path="$3"   local path="$3"
    768   fi   fi
    # Line 762  minstallunit() Line 794  minstallunit()
    794  {  {
    795   local unit   local unit
    796   local file   local file
    797     local prefix
    798    
    799   [[ -z "$1" ]] && die "No unit given"   [[ -z "$1" ]] && die "No unit given"
    800    
    801     # get the right prefix for newer systemd
    802     [[ -x /bin/systemctl ]] && prefix=""
    803     [[ -x /usr/bin/systemctl ]] && prefix="/usr"
    804    
    805   # if no fullpath given use file from sourcedir   # if no fullpath given use file from sourcedir
    806   if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]   if [[ -z $(dirname $1) ]] || [[ $(dirname $1) = . ]]
    807   then   then
    # Line 781  minstallunit() Line 818  minstallunit()
    818   fi   fi
    819    
    820   # needed directory   # needed directory
    821   install -d ${BINDIR}/lib/systemd/system || die   install -d ${BINDIR}${prefix}/lib/systemd/system || die
    822    
    823   # install our initscript   # install our initscript
    824   install -v -m 0644 -o root -g root ${file} ${BINDIR}/lib/systemd/system/${unit} || die   install -v -m 0644 -o root -g root ${file} ${BINDIR}${prefix}/lib/systemd/system/${unit} || die
    825  }  }
    826    
    827  # installs systemd tmp configs to /etc/tmpfiles.d  # installs systemd tmp configs to /etc/tmpfiles.d
    Legend:
    Removed from v.8644  
    changed lines
      Added in v.12653