Loading

runme patch

  1. diff --git a/runme.sh b/runme.sh
  2. index c6efdd5..e05e5b7 100755
  3. --- a/runme.sh
  4. +++ b/runme.sh
  5. @@ -14,7 +14,6 @@ test "$L10N_CHANGESETS"
  6.  : WORKSPACE                     "${WORKSPACE:=/home/worker/workspace}"
  7.  : ARTIFACTS_DIR                 "${ARTIFACTS_DIR:=/home/worker/artifacts}"
  8.  
  9. -whoami
  10.  pwd
  11.  
  12.  DATE=$(date +%Y-%m-%d)
  13. @@ -54,18 +53,8 @@ mkdir -p "$DISTRIBUTION_DIR/extensions"
  14.  for locale in $locales; do
  15.      $CURL -o "$DISTRIBUTION_DIR/extensions/langpack-${locale}@firefox.mozilla.org.xpi" \
  16.          "$CANDIDATES_DIR/${VERSION}-candidates/build${BUILD_NUMBER}/linux-x86_64/xpi/${locale}.xpi"
  17. -
  18. -    LANGPACKS="$LANGPACKS
  19. -              {
  20. -                  'type': 'file',
  21. -                  'path': '$DISTRIBUTION_DIR/extensions/langpack-${locale}@firefox.mozilla.org.xpi',
  22. -                  'dest': 'langpacks/'
  23. -              },"
  24.  done
  25. -export LANGPACKS
  26.  
  27. -# Generate flatpak manifest
  28. -envsubst '$LANGPACKS'< "$SCRIPT_DIRECTORY/flatpak.json.in" > "${WORKSPACE}/org.mozilla.firefox.json"
  29.  envsubst < "$SCRIPT_DIRECTORY/org.mozilla.firefox.appdata.xml.in" > "${WORKSPACE}/org.mozilla.firefox.appdata.xml"
  30.  cp -v "$SCRIPT_DIRECTORY/Makefile" "$WORKSPACE"
  31.  cp -v "$SCRIPT_DIRECTORY/org.mozilla.firefox.desktop" "$WORKSPACE"
  32. @@ -74,10 +63,41 @@ cp -v "$SCRIPT_DIRECTORY/default-preferences.js" "$WORKSPACE"
  33.  cp -v "$SCRIPT_DIRECTORY/launch-script.sh" "$WORKSPACE"
  34.  cd "${WORKSPACE}"
  35.  
  36. -#mkdir -p /var/run/dbus
  37. -export DBUS_SYSTEM_BUS_ADDRESS=`dbus-daemon --session --print-address=1 --fork`
  38.  flatpak remote-add --user --if-not-exists --from flathub https://dl.flathub.org/repo/flathub.flatpakrepo
  39. -flatpak-builder --assumeyes --user --install-deps-from=flathub --force-clean --disable-rofiles-fuse --disable-cache --repo="$WORKSPACE"/repo --verbose "$WORKSPACE"/app org.mozilla.firefox.json
  40. +flatpak install -y flathub org.freedestkop.Sdk//19.08 org.freedestkop.Platform//19.08 org.mozilla.base
  41. +
  42. +flatpak build-init build org.mozilla.firefox org.freedesktop.Sdk//19.08 org.freedesktop.Platform//19.08 --base=org.mozilla.firefox-base
  43. +
  44. +appdir=build/files
  45. +install -d "${appdir}/lib/"
  46. +(cd "${appdir}/lib/" && tar jxf "${WORKSPACE}/firefox.tar.bz2")
  47. +install -D -m644 -t "${appdir}/share/appdata" org.mozilla.firefox.appdata.xml
  48. +install -D -m644 -t "${appdir}/share/applications" org.mozilla.firefox.desktop
  49. +for size in 16 32 48 64 128; do
  50. +    install -D -m644 "${appdir}/lib/firefox/browser/chrome/icons/default/default${size}.png" "${appdir}/share/icons/hicolor/${size}x${size}/apps/org.mozilla.firefox.png"
  51. +done
  52. +install -D -m644 -t "${appdir}/lib/firefox/distribution/extensions" "${DISTRIBUTION_DIR}"/extensions/*
  53. +install -D -m644 -t "${appdir}/lib/firefox/distribution" distribution.ini
  54. +install -D -m644 -t "${appdir}/lib/firefox/browser/defaults/preferences" default-preferences.js
  55. +install -D -m755 launch-script.sh "${appdir}/bin/firefox"
  56. +flatpak build-finish build                                      \
  57. +        --share=ipc --socket=x11                                \
  58. +        --share=network                                         \
  59. +        --socket=pulseaudio                                     \
  60. +        --persist=.mozilla                                      \
  61. +        --filesystem=xdg-download:rw                            \
  62. +        --device=dri                                            \
  63. +        --filesystem=xdg-run/dconf                              \
  64. +        --filesystem=xdg-config/dconf:ro                        \
  65. +        --talk-name=ca.desrt.dconf                              \
  66. +        --env=DCONF_USER_CONFIG_DIR=.config/dconf               \
  67. +        --talk-name=org.freedesktop.FileManager1                \
  68. +        --system-talk-name=org.freedesktop.NetworkManager       \
  69. +        --talk-name=org.a11y.Bus                                \
  70. +        --talk-name=org.gnome.SessionManager                    \
  71. +        --talk-name=org.freedesktop.ScreenSaver                 \
  72. +        --talk-name="org.gtk.vfs.*"
  73. +flatpak build-export --disable-sandbox repo build
  74.  flatpak build-update-repo repo
  75.  tar cvfz flatpak.tar.gz repo