Verified Commit 032c4cfd authored by Pier Angelo Vendrame's avatar Pier Angelo Vendrame 🎃
Browse files

Bug 41720: Switch back from cp -l to mv. 

We switched to cp -l to avoid errors when trying to move an inode to
itself (case we might enocunter when re-running projects/release/build,
since we hard-link release files when possible).
However, `cp -l` does not fall back to a copy when hard link is not
possible, instead it fails.
So, go back to `mv`, but run `rm -f` before running mv, to avoid the
error when trying to move the file to itself.
parent 2c9daf78

projects/release/build

+25 −14
Original line number Diff line number Diff line
@@ -5,53 +5,64 @@ 
destdir="[% dest_dir _ '/' _ c("var/publish_dir") %]"

mkdir -p "$destdir"



function merge_directory {

  pushd $1

  find -type d -exec mkdir -p $destdir/{} \;

  # tor-browser-build#40338: Try to remove any existing destination, as it might

  # be the same inode when re-running this script, which makes mv fail.

  find -type f -exec rm -f $destdir/{} \;

  find -type f -exec mv {} $destdir/{} \;

  popd

}



[% IF c("var/browser_platforms/android-armv7") -%]

  cp -alf "[% c('input_files_by_name/android-armv7') %]"/* "$destdir"/

  merge_directory "[% c('input_files_by_name/android-armv7') %]"

[% END -%]

[% IF c("var/browser_platforms/android-x86") -%]

  mv_files "[% c('input_files_by_name/android-x86') %]"

[% END -%]

[% IF c("var/browser_platforms/android-x86_64") -%]

  cp -alf "[% c('input_files_by_name/android-x86_64') %]"/* "$destdir"/

  merge_directory "[% c('input_files_by_name/android-x86_64') %]"

[% END -%]

[% IF c("var/browser_platforms/android-aarch64") -%]

  cp -alf "[% c('input_files_by_name/android-aarch64') %]"/* "$destdir"/

  merge_directory "[% c('input_files_by_name/android-aarch64') %]"

[% END -%]

[% IF c("var/browser_platforms/windows-i686") -%]

  cp -alf "[% c('input_files_by_name/windows-i686') %]"/* "$destdir"/

  merge_directory "[% c('input_files_by_name/windows-i686') %]"

[% END -%]

[% IF c("var/browser_platforms/windows-x86_64") -%]

  cp -alf "[% c('input_files_by_name/windows-x86_64') %]"/* "$destdir"/

  merge_directory "[% c('input_files_by_name/windows-x86_64') %]"

[% END -%]

[% IF c("var/browser_platforms/macos") -%]

  cp -alf "[% c('input_files_by_name/macos') %]"/* "$destdir"/

  merge_directory "[% c('input_files_by_name/macos') %]"

[% END -%]

[% IF c("var/browser_platforms/macos-x86_64") -%]

  cp -alf "[% c('input_files_by_name/macos-x86_64') %]"/* "$destdir"/

  merge_directory "[% c('input_files_by_name/macos-x86_64') %]"

[% END -%]

[% IF c("var/browser_platforms/macos-aarch64") -%]

  cp -alf "[% c('input_files_by_name/macos-aarch64') %]"/* "$destdir"/

  merge_directory "[% c('input_files_by_name/macos-aarch64') %]"

[% END -%]

[% IF c("var/browser_platforms/linux-i686") -%]

  mv_files "[% c('input_files_by_name/linux-i686') %]"

[% END -%]

[% IF c("var/browser_platforms/linux-x86_64") -%]

  cp -alf "[% c('input_files_by_name/linux-x86_64') %]"/* "$destdir"/

  merge_directory "[% c('input_files_by_name/linux-x86_64') %]"

[% END -%]

[% IF c("var/browser_platforms/linux-aarch64") -%]

  cp -alf "[% c('input_files_by_name/linux-aarch64') %]"/* "$destdir"/

  merge_directory "[% c('input_files_by_name/linux-aarch64') %]"

[% END -%]

[% IF c("var/linux-packages") || c("var/linux-packages-aarch64") -%]

  [% IF c("var/linux-packages") -%]

    cp -alf "[% c('input_files_by_name/deb-packages') %]"/* "$destdir"/

    merge_directory "[% c('input_files_by_name/deb-packages') %]"

  [% END -%]

  [% IF c("var/linux-packages-aarch64") -%]

    cp -alf "[% c('input_files_by_name/deb-packages-aarch64') %]"/* "$destdir"/

    merge_directory "[% c('input_files_by_name/deb-packages-aarch64') %]"

  [% END -%]

  cp -alf "[% c('input_files_by_name/rpm-packages') %]"/* "$destdir"/

  merge_directory "[% c('input_files_by_name/rpm-packages') %]"

[% END -%]

[% IF c("var/browser-src") -%]

  cp -alf "[% c('input_files_by_name/src-firefox') %]" "$destdir"/

  rm -f "$destdir/[% c('input_files_by_name/src-firefox') %]"

  mv [% c('input_files_by_name/src-firefox') %] "$destdir"/

[% END -%]

cd "$destdir"

cat > .htaccess <<'EOF'