diff options
| -rwxr-xr-x | appimage/build_appimage.sh | 2 | ||||
| -rwxr-xr-x | binary_tarball/scripts/1_Install_Dependencies.sh | 4 | ||||
| -rwxr-xr-x | binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 6 | ||||
| -rwxr-xr-x | flatpak/build_flatpak.sh | 12 |
4 files changed, 6 insertions, 18 deletions
diff --git a/appimage/build_appimage.sh b/appimage/build_appimage.sh index c3e53d0..bdd9490 100755 --- a/appimage/build_appimage.sh +++ b/appimage/build_appimage.sh @@ -29,7 +29,7 @@ printf "\nDownloading AppImage Tool\n"; apt -qq update && apt -qqy install wget; wget $_APPIMAGETOOL_DOWNLOAD_URL -O $_APPIMAGETOOL_FILE; chmod +x $_APPIMAGETOOL_FILE; -$_APPIMAGETOOL_FILE --appimage-mount $_APPIMAGETOOL_EXTRACTED_FOLDER; +$_APPIMAGETOOL_FILE --appimage-extract $_APPIMAGETOOL_EXTRACTED_FOLDER; rm -f $_APPIMAGETOOL_FILE; # Generate AppImage diff --git a/binary_tarball/scripts/1_Install_Dependencies.sh b/binary_tarball/scripts/1_Install_Dependencies.sh index f6c16ac..49f0613 100755 --- a/binary_tarball/scripts/1_Install_Dependencies.sh +++ b/binary_tarball/scripts/1_Install_Dependencies.sh @@ -6,5 +6,5 @@ _DEPENDENCIES="mercurial wget git"; # Installs Dependencies printf "\nInstalling dependencies: $_DEPENDENCIES\n"; -apt-get -qq update; -apt-get -y -qq install $_DEPENDENCIES; +DEBIAN_FRONTEND=noninteractive apt-get -qq update; +DEBIAN_FRONTEND=noninteractive apt-get -y -qq install $_DEPENDENCIES; diff --git a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh index cae42b0..266fbd2 100755 --- a/binary_tarball/scripts/5_Configure_Binary_Tarball.sh +++ b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh @@ -10,17 +10,17 @@ _SETTINGS_REPO='https://gitlab.com/librewolf-community/settings.git'; # Extracts the binary tarball printf "\nExtracting librewolf binary tarball\n"; -tar -xvf $BINARY_TARBALL; +tar -xf $BINARY_TARBALL; # Adds the librefox config files to the packaged tarball printf "\nCopying librewolf settings to extracted binary tarball\n"; -git clone _SETTINGS_REPO $_EXTRACTED_TARBALL_FOLDER/settings; +git clone $_SETTINGS_REPO $_EXTRACTED_TARBALL_FOLDER/settings; cp $TOGGLE_SETTINGS_SCRIPT $_EXTRACTED_TARBALL_FOLDER/settings; cp $LAUNCHER_SCRIPT $_EXTRACTED_TARBALL_FOLDER/launch_librewolf.sh; # Repacks the binary tarball printf "\nRecompressing binary tarball\n"; -tar -jcvf $BINARY_TARBALL $_EXTRACTED_TARBALL_FOLDER; +tar -jcf $BINARY_TARBALL $_EXTRACTED_TARBALL_FOLDER; diff --git a/flatpak/build_flatpak.sh b/flatpak/build_flatpak.sh index bebf131..83d4e4a 100755 --- a/flatpak/build_flatpak.sh +++ b/flatpak/build_flatpak.sh @@ -9,10 +9,6 @@ BINARY_TARBALL=$1; FLATPAK_REPO=$2; FLATPAK_BUNDLE=$3; _SCRIPT_FOLDER=$(realpath $(dirname $0)); -_APT_SOURCE_LIST=/etc/apt/source.list; -_APT_REPO='deb http://ppa.launchpad.net/alexlarsson/flatpak/ubuntu bionic main' -_APT_REPO_KEY=FA577F07; -_APT_PACKAGES_TO_INSTALL="flatpak flatpak-builder"; _FLATHUB_REPO="flathub https://flathub.org/repo/flathub.flatpakrepo"; _FLATHUB_PACKAGES_TO_INSTALL="org.gnome.Platform/x86_64/3.32 org.gnome.Sdk/x86_64/3.32"; _EXTRACTED_BINARY_TARBALL_FOLDER=./librewolf @@ -20,14 +16,6 @@ _FLATPAK_JSON_FILE=$_SCRIPT_FOLDER/content/io.gitlab.LibreWolf.json; _FLATPAK_BUILD_SOURCE_FOLDER=./source; _FLATPAK_BUILD_FOLDER=build-dir; - -# Install flatpak -printf "\nInstalling flatpak\n"; -echo $_APT_REPO >> $_APT_SOURCE_LIST; -apt-get -qq update && apt-get -qqy install gnupg2 && apt-key adv --keyserver keyserver.ubuntu.com --recv-keys $_APT_REPO_KEY; -apt-get -qq update; -apt-get -qqy install $_APT_PACKAGES_TO_INSTALL; - # Install build dependencies printf "\nInstalling flatpak build dependencies\n"; flatpak remote-add --if-not-exists $_FLATHUB_REPO; |