Ticket #77: erase.diff

File erase.diff, 0.8 kB (added by Jan-Nik, 4 months ago)

  • makepackage

    old new  
    308308{ 
    309309        [ "$payload_dir" != "" ] && rm -rf "$payload_dir" 
    310310        [ "$metadata_dir" != "" ] && rm -rf "$metadata_dir" 
    311         [ "$build_root" != "." -a "$build_root" != "" -a "$APKG_BUILD_ROOT" = "" ] && rm -rf "$build_root" 
     311 
     312        current_directory="$PWD" 
     313        cd -P "$build_root" 
     314        build_root=$PWD 
     315        cd -P $current_directory 
     316        if [[ "$build_root" != "$PWD" && "$build_root" != "" && "$APKG_BUILD_ROOT" == "" ]]; then 
     317                rm -rf "$build_root" 
     318        fi 
     319        cd "$current_directory" 
     320 
    312321        [ "$_virtual_build_root" != "." -a "$_virtual_build_root" != "" -a "$APKG_BUILD_ROOT" = "" ] && rm -rf "$_virtual_build_root" 
    313322        [ "$__apkg_errors_file" != "." ] && rm -f "$__apkg_errors_file" 
    314323        unset payload_dir