script fixups

This commit is contained in:
Alexander Frick 2023-06-23 00:38:08 -05:00
parent 94d6d59533
commit 9da8e699e7
5 changed files with 12 additions and 62 deletions

View File

@ -39,6 +39,7 @@ codesign --force --deep --sign - out/thorium/Thorium.app &&
# Build dmg package
chrome/installer/mac/pkg-dmg --sourcefile --source out/thorium/Thorium.app --target "out/thorium/Thorium_MacOS.dmg" --volname Thorium --symlink /Applications:/Applications --format UDBZ --verbosity 2 &&
cd $HOME/thorium &&
cat logos/apple_ascii_art.txt &&
printf "${GRE}.DMG Build Completed. ${YEL}Installer at \'//chromium/src/out/thorium/Thorium*_MacOS.dmg\'\n" &&

View File

@ -39,6 +39,7 @@ codesign --force --deep --sign - out/thorium/Chromium.app &&
# Build dmg package
chrome/installer/mac/pkg-dmg --sourcefile --source out/thorium/Chromium.app --target "out/thorium/Chromium_MacOS.dmg" --volname Chromium --symlink /Applications:/Applications --format UDBZ --verbosity 2 &&
cd $HOME/thorium &&
cat logos/apple_ascii_art.txt &&
printf "${GRE}.DMG Build Completed. ${YEL}Installer at //chromium/src/out/thorium/Chromium*.dmg\n" &&

View File

@ -17,6 +17,15 @@ yell() { echo "$0: $*" >&2; }
die() { yell "$*"; exit 111; }
try() { "$@" || die "${RED}Failed $*"; }
# chromium/src dir env variable
if [ -z "${CR_DIR}" ]; then
CR_SRC_DIR="$HOME/chromium/src"
export CR_SRC_DIR
else
CR_SRC_DIR="${CR_DIR}"
export CR_SRC_DIR
fi
# --help
displayHelp () {
cd ${CR_SRC_DIR} &&
@ -34,15 +43,6 @@ case $1 in
--help) displayHelp; exit 0;;
esac
# chromium/src dir env variable
if [ -z "${CR_DIR}" ]; then
CR_SRC_DIR="$HOME/chromium/src"
export CR_SRC_DIR
else
CR_SRC_DIR="${CR_DIR}"
export CR_SRC_DIR
fi
# --version
displayVersion () {
cd ${CR_SRC_DIR} &&

View File

@ -182,8 +182,8 @@ stage_install_common() {
install -m 755 "${OUTPUTDIR}/pak" "${STAGEDIR}/usr/bin/"
install -m 644 "${OUTPUTDIR}/initial_preferences" "${STAGEDIR}/${INSTALLDIR}/"
else
install -m 644 "${OUTPUTDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
install -m 644 "${OUTPUTDIR}/theme_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
install -m 644 "${OUTPUTDIR}/ui_resources_100_percent.pak" "${STAGEDIR}/${INSTALLDIR}/"
fi
# ICU data file; Necessary when the GN icu_use_data_file flag is true.

View File

@ -56,61 +56,9 @@ git checkout -f origin/master &&
cd ${CR_SRC_DIR} &&
rm -v -f ${CR_SRC_DIR}/components/neterror/resources/images/default_100_percent/offline/favicon-16x16.png &&
rm -v -f ${CR_SRC_DIR}/components/neterror/resources/images/default_200_percent/offline/favicon-32x32.png &&
rm -v -f ${CR_SRC_DIR}/content/shell/app/thorium_shell.ico &&
rm -v -f ${CR_SRC_DIR}/chrome/browser/thorium_flag_entries.h &&
rm -v -f ${CR_SRC_DIR}/chrome/browser/thorium_flag_choices.h &&
rm -v -r -f ${CR_SRC_DIR}/third_party/pak &&
rm -v -r -f ${CR_SRC_DIR}/third_party/widevine/CREDITS.chromium &&
rm -r -f -v chrome/browser/bromite_flag_choices.h &&
rm -r -f -v chrome/browser/bromite_flag_entries.h &&
rm -r -f -v chrome/browser/ungoogled_flag_choices.h &&
rm -r -f -v chrome/browser/ungoogled_flag_entries.h &&
rm -r -f -v chrome/browser/ungoogled_platform_flag_choices.h &&
rm -r -f -v chrome/browser/ungoogled_platform_flag_entries.h &&
rm -r -f -v components/ungoogled/ &&
rm -r -f -v net/url_request/trk_protocol_handler.cc &&
rm -r -f -v net/url_request/trk_protocol_handler.h &&
rm -r -f -v chrome/browser/BUILD.gn.rej &&
rm -r -f -v chrome/browser/browser_process.h.rej &&
rm -r -f -v chrome/browser/browser_process_impl.cc.rej &&
rm -r -f -v chrome/browser/browser_process_impl.h.rej &&
rm -r -f -v chrome/browser/browsing_data/chrome_browsing_data_remover_delegate.cc.rej &&
rm -r -f -v chrome/browser/chrome_content_browser_client.cc.rej &&
rm -r -f -v chrome/browser/component_updater/file_type_policies_component_installer.cc.rej &&
rm -r -f -v chrome/browser/download/chrome_download_manager_delegate.cc.rej &&
rm -r -f -v chrome/browser/download/download_item_model.cc.rej &&
rm -r -f -v chrome/browser/download/download_prefs.cc.rej &&
rm -r -f -v chrome/browser/download/download_target_determiner.cc.rej &&
rm -r -f -v chrome/browser/extensions/api/downloads/downloads_api.cc.rej &&
rm -r -f -v chrome/browser/extensions/api/downloads/downloads_api.h.rej &&
rm -r -f -v chrome/browser/extensions/api/safe_browsing_private/safe_browsing_private_api.cc.rej &&
rm -r -f -v chrome/browser/extensions/api/webstore_private/webstore_private_api.cc.rej &&
rm -r -f -v chrome/browser/extensions/blocklist_state_fetcher.cc.rej &&
rm -r -f -v chrome/browser/extensions/blocklist_state_fetcher.h.rej &&
rm -r -f -v chrome/browser/metrics/chrome_metrics_service_client.cc.rej &&
rm -r -f -v chrome/browser/net/trial_comparison_cert_verifier_controller.cc.rej &&
rm -r -f -v chrome/browser/profiles/chrome_browser_main_extra_parts_profiles.cc.rej &&
rm -r -f -v chrome/browser/profiles/profile_impl.cc.rej &&
rm -r -f -v chrome/browser/profiles/profiles_state.cc.rej &&
rm -r -f -v chrome/browser/safe_browsing/BUILD.gn.rej &&
rm -r -f -v chrome/browser/ssl/security_state_tab_helper.cc.rej &&
rm -r -f -v chrome/browser/ui/BUILD.gn.rej &&
rm -r -f -v chrome/browser/ui/tab_helpers.cc.rej &&
rm -r -f -v chrome/browser/ui/webui/downloads/downloads_dom_handler.cc.rej &&
rm -r -f -v chrome/browser/ui/webui/downloads/downloads_dom_handler.h.rej &&
rm -r -f -v chrome/browser/ui/webui/interstitials/interstitial_ui.cc.rej &&
rm -r -f -v chrome/renderer/chrome_content_renderer_client.cc.rej &&
rm -r -f -v components/security_interstitials/content/cert_report_helper.cc.rej &&
rm -r -f -v chrome/browser/safe_browsing/safe_browsing_dummy.cc &&
git checkout -f origin/main &&