epm: modify PATH only for subprocess

bin/epm

@@ -57,8 +57,6 @@ load_helper()
 
 load_helper epm-sh-functions
 
-#PATH=$PATH:/sbin:/usr/sbin
-
 set_pm_type
 
 check_tty

bin/epm-assure

@@ -19,7 +19,8 @@
 
 __check_command_in_path()
 {
-    PATH=$PATH:/sbin:/usr/sbin print_command_path "$1"
+    # with hack for sudo case
+    ( PATH=$PATH:/sbin:/usr/sbin print_command_path "$1" )
 }
 
 # returns TRUE if package version is omitted, or package is not installed, or version is too old

bin/epm-pack

@@ -42,13 +42,11 @@ __epm_pack()
     set_sudo
     export SUDO
 
-    # TODO: inside () ?
-    export PATH=$PROGDIR:$PATH
-
+    [ "$PROGDIR" = "/usr/bin" ] && SCPATH="$PATH" || SCPATH="$PROGDIR:$PATH"
     local bashopt=''
     [ -n "$verbose" ] && bashopt='-x'
     #info "Running $($script --description 2>/dev/null) ..."
-    ( unset EPMCURDIR ; docmd $CMDSHELL $bashopt $repackcode "$tarname" "$filefortarname" "$packversion" ) || fatal
+    ( unset EPMCURDIR ; export PATH=$SCPATH ;docmd $CMDSHELL $bashopt $repackcode "$tarname" "$filefortarname" "$packversion" ) || fatal
     returntarname="$(cat "$filefortarname")" || fatal "pack script $repackcode didn't set tarname"
 
     [ -s "$returntarname" ] || fatal "pack script $repackcode return unexist $returntarname file"

bin/epm-play

@@ -55,7 +55,8 @@ __run_script()
     [ -f "$script.rpmnew" ] && warning "There is .rpmnew file(s) in $psdir dir. The play script can be outdated."
 
     shift
-    ( unset EPMCURDIR ; export PATH=$PROGDIR:$PATH ; $script "$@" )
+    [ "$PROGDIR" = "/usr/bin" ] && SCPATH="$PATH" || SCPATH="$PROGDIR:$PATH"
+    ( unset EPMCURDIR ; export PATH=$SCPATH ; $script "$@" )
     return
 }
 
@@ -145,7 +146,6 @@ __epm_play_run()
     local script="$psdir/$1.sh"
     shift
 
-    export PATH=$PROGDIR:$PATH
 
     set_sudo
     export SUDO
@@ -158,7 +158,8 @@ __epm_play_run()
     local bashopt=''
     [ -n "$verbose" ] && bashopt='-x'
     #info "Running $($script --description 2>/dev/null) ..."
-    docmd $CMDSHELL $bashopt $script "$@"
+    [ "$PROGDIR" = "/usr/bin" ] && SCPATH="$PATH" || SCPATH="$PROGDIR:$PATH"
+    ( export EPM_OPTIONS="$EPM_OPTIONS $addopt" export PATH=$SCPATH ; docmd $CMDSHELL $bashopt $script "$@" )
 }
 
 __epm_play_list_installed()

bin/epm-repack-rpm

@@ -82,10 +82,10 @@ __apply_fix_code()
     [ -f "$repackcode.rpmnew" ] && warning "There is .rpmnew file(s) in $EPM_REPACK_SCRIPTS_DIR dir. The pack script can be outdated."
 
     shift
-    export PATH=$PROGDIR:$PATH
+    [ "$PROGDIR" = "/usr/bin" ] && SCPATH="$PATH" || SCPATH="$PROGDIR:$PATH"
     local bashopt=''
     [ -n "$verbose" ] && bashopt='-x'
-    ( unset EPMCURDIR ; docmd $CMDSHELL $bashopt $repackcode "$1" "$2" "$3" "$4" ) || fatal "There is an error from $repackcode script"
+    ( unset EPMCURDIR ; export PATH=$SCPATH ; docmd $CMDSHELL $bashopt $repackcode "$1" "$2" "$3" "$4" ) || fatal "There is an error from $repackcode script"
 }
 
 __create_rpmmacros()