[BACK]Return to pp CVS log [TXT] [DIR] Up to [ELWIX - Embedded LightWeight unIX -] / embedaddon / sudo

Diff for /embedaddon/sudo/pp between versions 1.1.1.3 and 1.1.1.4

version 1.1.1.3, 2012/10/09 09:29:52 version 1.1.1.4, 2013/07/22 10:46:11
Line 1 Line 1
 #!/bin/sh  #!/bin/sh
 # Copyright 2012 Quest Software, Inc. ALL RIGHTS RESERVED  # Copyright 2012 Quest Software, Inc. ALL RIGHTS RESERVED
pp_revision="368"pp_revision="371"
  # Copyright 2012 Quest Software, Inc.  ALL RIGHTS RESERVED.   # Copyright 2012 Quest Software, Inc.  ALL RIGHTS RESERVED.
  #   #
  # Redistribution and use in source and binary forms, with or without   # Redistribution and use in source and binary forms, with or without
Line 4493  do_start() Line 4493  do_start()
     then      then
         group_opt="--group $GROUP"          group_opt="--group $GROUP"
     fi      fi
     if [ "$VERBOSE" = no ]  
     then  
         quiet_opt="--quiet"  
     else  
         quiet_opt="--verbose"  
     fi  
   
        start-stop-daemon --start $quiet_opt $pidfile_opt $user_opt --exec $DAEMON --test > /dev/null \        start-stop-daemon --start --quiet $pidfile_opt $user_opt --exec $DAEMON --test > /dev/null \
             || return 1              || return 1
   
     # Note: there seems to be no way to tell whether the daemon will fork itself or not, so pass      # Note: there seems to be no way to tell whether the daemon will fork itself or not, so pass
     # --background for now      # --background for now
    start-stop-daemon --start $quiet_opt $pidfile_opt $user_opt --exec $DAEMON -- \    start-stop-daemon --start --quiet $pidfile_opt $user_opt --exec $DAEMON -- \
         $DAEMON_ARGS \          $DAEMON_ARGS \
         || return 2          || return 2
 }  }
Line 4531  do_stop() Line 4525  do_stop()
     then      then
         signal_opt="--signal $STOP_SIGNAL"          signal_opt="--signal $STOP_SIGNAL"
     fi      fi
    if [ "$VERBOSE" = "no" ]        start-stop-daemon --stop --quiet $signal_opt --retry=TERM/30/KILL/5 $pidfile_opt --name $NAME
    then 
        quiet_opt="--quiet" 
    else 
        quiet_opt="--verbose" 
    fi 
        start-stop-daemon --stop $quiet_opt $signal_opt --retry=TERM/30/KILL/5 $pidfile_opt --name $NAME 
         RETVAL="$?"          RETVAL="$?"
         [ "$RETVAL" = 2 ] && return 2          [ "$RETVAL" = 2 ] && return 2
         # Wait for children to finish too if this is a daemon that forks          # Wait for children to finish too if this is a daemon that forks
Line 4546  do_stop() Line 4534  do_stop()
         # that waits for the process to drop all resources that could be          # that waits for the process to drop all resources that could be
         # needed by services started subsequently.  A last resort is to          # needed by services started subsequently.  A last resort is to
         # sleep for some time.          # sleep for some time.
        start-stop-daemon --stop $quiet_opt --oknodo --retry=0/30/KILL/5 --exec $DAEMON        start-stop-daemon --stop --quiet --oknodo --retry=0/30/KILL/5 --exec $DAEMON
         [ "$?" = 2 ] && return 2          [ "$?" = 2 ] && return 2
         # Many daemons don't delete their pidfiles when they exit.          # Many daemons don't delete their pidfiles when they exit.
         test -z $PIDFILE || rm -f $PIDFILE          test -z $PIDFILE || rm -f $PIDFILE
Line 4567  do_reload() { Line 4555  do_reload() {
     fi      fi
     if [ -n "$RELOAD_SIGNAL" ]      if [ -n "$RELOAD_SIGNAL" ]
     then      then
            start-stop-daemon --stop --signal $RELOAD_SIGNAL $quiet_opt $pidfile_opt --name $NAME            start-stop-daemon --stop --signal $RELOAD_SIGNAL --quiet $pidfile_opt --name $NAME
     fi      fi
         return 0          return 0
 }  }
Line 6612  pp_backend_macos_init () { Line 6600  pp_backend_macos_init () {
     pp_macos_pkg_readme=      pp_macos_pkg_readme=
     pp_macos_pkg_welcome=      pp_macos_pkg_welcome=
     pp_macos_sudo=sudo      pp_macos_sudo=sudo
       pp_macos_installer_plugin=
     # OS X puts the library version *before* the .dylib extension      # OS X puts the library version *before* the .dylib extension
     pp_shlib_suffix='*.dylib'      pp_shlib_suffix='*.dylib'
 }  }
Line 6835  pp_macos_bom_fix_parents () { Line 6824  pp_macos_bom_fix_parents () {
                     # Make sure we do not override system directories                      # Make sure we do not override system directories
                     if ($d =~ m:^\./(etc|var)$:) {                      if ($d =~ m:^\./(etc|var)$:) {
                       my $tgt = "private/$1";                        my $tgt = "private/$1";
                      my $_ = `/usr/bin/printf "$tgt" | /usr/bin/cksum /dev/stdin`;                      my ($sum, $len) = split(/\s+/, `/usr/bin/printf "$tgt" | /usr/bin/cksum /dev/stdin`);
                      my ($sum, $len) = split; 
                       print "$d\t120755\t0/0\t$len\t$sum\t$tgt\n";                        print "$d\t120755\t0/0\t$len\t$sum\t$tgt\n";
                     } elsif ($d eq "." || $d eq "./Library") {                      } elsif ($d eq "." || $d eq "./Library") {
                       print "$d\t41775\t0/80\n";                        print "$d\t41775\t0/80\n";
Line 7130  CompressedSize 0 Line 7118  CompressedSize 0
     awk '{ print "." $6 }' $filelists | sed 's:/$::' | sort | /usr/bin/cpio -o | pp_macos_rewrite_cpio $filelists | gzip -9f -c > $Contents/Archive.pax.gz      awk '{ print "." $6 }' $filelists | sed 's:/$::' | sort | /usr/bin/cpio -o | pp_macos_rewrite_cpio $filelists | gzip -9f -c > $Contents/Archive.pax.gz
     )      )
   
       # Copy installer plugins if any
       if test -n "$pp_macos_installer_plugin"; then
           if test ! -f "$pp_macos_installer_plugin/InstallerSections.plist"; then
               pp_error "Missing InstallerSections.plist file in $pp_macos_installer_plugin"
           fi
           mkdir -p $pkgdir/Plugins
           cp -R "$pp_macos_installer_plugin"/* $pkgdir/Plugins
       fi
   
     test -d $pp_wrkdir/bom_stage && $pp_macos_sudo rm -rf $pp_wrkdir/bom_stage      test -d $pp_wrkdir/bom_stage && $pp_macos_sudo rm -rf $pp_wrkdir/bom_stage
   
     rm -f ${name}-${version}.dmg      rm -f ${name}-${version}.dmg
Line 7298  pp_backend_macos_flat () { Line 7295  pp_backend_macos_flat () {
     cd $pp_destdir || pp_error "Can't cd to $pp_destdir"      cd $pp_destdir || pp_error "Can't cd to $pp_destdir"
     awk '{ print "." $6 }' $filelists | sed 's:/$::' | sort | /usr/bin/cpio -o | pp_macos_rewrite_cpio $filelists | gzip -9f -c > $bundledir/Payload      awk '{ print "." $6 }' $filelists | sed 's:/$::' | sort | /usr/bin/cpio -o | pp_macos_rewrite_cpio $filelists | gzip -9f -c > $bundledir/Payload
     )      )
   
       # Copy installer plugins if any
       if test -n "$pp_macos_installer_plugin"; then
           if test ! -f "$pp_macos_installer_plugin/InstallerSections.plist"; then
               pp_error "Missing InstallerSections.plist file in $pp_macos_installer_plugin"
           fi
           mkdir -p $pkgdir/Plugins
           cp -R "$pp_macos_installer_plugin"/* $pkgdir/Plugins
       fi
   
     test -d $pp_wrkdir/bom_stage && $pp_macos_sudo rm -rf $pp_wrkdir/bom_stage      test -d $pp_wrkdir/bom_stage && $pp_macos_sudo rm -rf $pp_wrkdir/bom_stage
   
Removed from v.1.1.1.3  
changed lines
  Added in v.1.1.1.4

FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>