From 088d2f7727fd1c88b75bec370d9131e0bbd1e432 Mon Sep 17 00:00:00 2001 From: BeatLink Date: Fri, 16 Aug 2019 22:00:32 -0500 Subject: [PATCH] move linux files to top level --- README.md | 36 ++++++------------- .../appimage => appimage}/build_appimage.sh | 0 {linux/appimage => appimage}/content/.DirIcon | 0 {linux/appimage => appimage}/content/AppRun | 0 .../content/librewolf.desktop | 0 .../content/librewolf.svg | 0 .../build_tarball.sh | 7 ++-- .../content/launch_librewolf.sh | 0 .../content}/toggle-settings.sh | 0 .../scripts/1_Install_Dependencies.sh | 0 .../scripts/2_Download_Source_Code.sh | 0 .../scripts/3_Configure_Source_Code.sh | 0 .../scripts/4_Build_Binary_Tarball.sh | 0 .../scripts/5_Configure_Binary_Tarball.sh | 7 ++-- linux/build.sh => build.sh | 0 {linux/flatpak => flatpak}/build_flatpak.sh | 0 .../content/io.gitlab.LibreWolf.json | 0 linux/README.md | 14 -------- 18 files changed, 20 insertions(+), 44 deletions(-) rename {linux/appimage => appimage}/build_appimage.sh (100%) rename {linux/appimage => appimage}/content/.DirIcon (100%) rename {linux/appimage => appimage}/content/AppRun (100%) rename {linux/appimage => appimage}/content/librewolf.desktop (100%) rename {linux/appimage => appimage}/content/librewolf.svg (100%) rename {linux/binary_tarball => binary_tarball}/build_tarball.sh (79%) rename {linux/binary_tarball => binary_tarball}/content/launch_librewolf.sh (100%) rename {linux/binary_tarball => binary_tarball/content}/toggle-settings.sh (100%) rename {linux/binary_tarball => binary_tarball}/scripts/1_Install_Dependencies.sh (100%) rename {linux/binary_tarball => binary_tarball}/scripts/2_Download_Source_Code.sh (100%) rename {linux/binary_tarball => binary_tarball}/scripts/3_Configure_Source_Code.sh (100%) rename {linux/binary_tarball => binary_tarball}/scripts/4_Build_Binary_Tarball.sh (100%) rename {linux/binary_tarball => binary_tarball}/scripts/5_Configure_Binary_Tarball.sh (73%) rename linux/build.sh => build.sh (100%) rename {linux/flatpak => flatpak}/build_flatpak.sh (100%) rename {linux/flatpak => flatpak}/content/io.gitlab.LibreWolf.json (100%) delete mode 100644 linux/README.md diff --git a/README.md b/README.md index 867f5f8..92458b0 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,14 @@ -![Logo](https://gitlab.com/librewolf-community/librewolf/raw/master/branding/logo/Logo.svg) +This Repository contains all the required material to build the browser on Linux platforms. -# LibreWolf: Browse With Freedom -[![Download Badge](https://img.shields.io/badge/Download-purple.svg)](https://gitlab.com/librewolf-community/librewolf/releases) -[![Website Badge](https://img.shields.io/badge/Website-librewolf--community.gitlab.io-blue.svg)](https://LibreWolf-Community.gitlab.io) -[![Chat Badge](https://img.shields.io/badge/Chat-Gitter-blue.svg)](https://gitter.im/librewolf-community/librewolf) -[![Status Badge](https://img.shields.io/badge/Status-Active_Development-brightgreen.svg)](https://gitlab.com/librewolf-community/librewolf/commits/master) -[![Pipelines Badge](https://gitlab.com/librewolf-community/librewolf/badges/master/pipeline.svg)](https://gitlab.com/librewolf-community/librewolf/pipelines) - -This project is an independent fork of Firefox, with the primary goals of privacy security and user freedom. It is the community run successor to [LibreFox](https://github.com/intika/Librefox) - -## [Documentation](https://librewolf-community.gitlab.io/docs) - -https://librewolf-community.gitlab.io/docs - -The docs are built from the [LibreWolf docs repo](https://gitlab.com/librewolf-community/librewolf-docs). - -## [Website](https://librewolf-community.gitlab.io) - -https://librewolf-community.gitlab.io - -The website is built from the [`librewolf-community.gitlab.io` repo](https://gitlab.com/librewolf-community/librewolf-community.gitlab.io). [Hugo](https://gohugo.io) is used to generate the site. - -## Browser Files -This folder contains platform specific subfolders which houses the scripts and files required to compile LibreWolf on various platforms such as Linux, Windows, Mac and android. -All of the platforms are self explanatory with the exception of common. Common stores files common to all platforms, mainly our custom branding to be applied to the source code. +### Requirements +* Ubuntu or Linux Mint (Bionic or later) +### Notes +* As this script installs files during the build, it is recommended to run this script in a VM or installation dedicated to building. +* You will occassionally need to enter your sudo password. Running this script as root has not been tested +* This script has been tested with Linux Mint 19.1 +* The flatpak build is not ready yet. +### Instructions +* Run build.sh inside this folder. +* Packages will be saved in the repository root folder. diff --git a/linux/appimage/build_appimage.sh b/appimage/build_appimage.sh similarity index 100% rename from linux/appimage/build_appimage.sh rename to appimage/build_appimage.sh diff --git a/linux/appimage/content/.DirIcon b/appimage/content/.DirIcon similarity index 100% rename from linux/appimage/content/.DirIcon rename to appimage/content/.DirIcon diff --git a/linux/appimage/content/AppRun b/appimage/content/AppRun similarity index 100% rename from linux/appimage/content/AppRun rename to appimage/content/AppRun diff --git a/linux/appimage/content/librewolf.desktop b/appimage/content/librewolf.desktop similarity index 100% rename from linux/appimage/content/librewolf.desktop rename to appimage/content/librewolf.desktop diff --git a/linux/appimage/content/librewolf.svg b/appimage/content/librewolf.svg similarity index 100% rename from linux/appimage/content/librewolf.svg rename to appimage/content/librewolf.svg diff --git a/linux/binary_tarball/build_tarball.sh b/binary_tarball/build_tarball.sh similarity index 79% rename from linux/binary_tarball/build_tarball.sh rename to binary_tarball/build_tarball.sh index 83da436..adf9ad3 100755 --- a/linux/binary_tarball/build_tarball.sh +++ b/binary_tarball/build_tarball.sh @@ -8,15 +8,16 @@ set -e; BINARY_TARBALL=$1; _SCRIPT_FOLDER=$(realpath $(dirname $0)); _REPOSITORY_FOLDER=$(realpath $_SCRIPT_FOLDER/../../../); + _BINARY_TARBALL_SOURCE_FOLDER=$_SCRIPT_FOLDER/compile; _BINARY_TARBALL_SOURCE_CONTENT_FOLDER=$_REPOSITORY_FOLDER/browser/common/source_files/; -_BINARY_TARBALL_SETTINGS_FOLDER=$_REPOSITORY_FOLDER/settings; -_BINARY_TARBALL_LAUNCH_SCRIPT=$_SCRIPT_FOLDER/binary_tarball/content/launch_librewolf.sh; +_BINARY_TARBALL_TOGGLE_SETTINGS_SCRIPT=$_SCRIPT_FOLDER/content/toggle-settings.sh; +_BINARY_TARBALL_LAUNCH_SCRIPT=$_SCRIPT_FOLDER/content/launch_librewolf.sh; # Executes the build $_SCRIPT_FOLDER/scripts/1_Install_Dependencies.sh; $_SCRIPT_FOLDER/scripts/2_Download_Source_Code.sh $_BINARY_TARBALL_SOURCE_FOLDER; $_SCRIPT_FOLDER/scripts/3_Configure_Source_Code.sh $_BINARY_TARBALL_SOURCE_FOLDER $_BINARY_TARBALL_SOURCE_CONTENT_FOLDER; $_SCRIPT_FOLDER/scripts/4_Build_Binary_Tarball.sh $_BINARY_TARBALL_SOURCE_FOLDER $BINARY_TARBALL; -$_SCRIPT_FOLDER/scripts/5_Configure_Binary_Tarball.sh $BINARY_TARBALL $_BINARY_TARBALL_SETTINGS_FOLDER $_BINARY_TARBALL_LAUNCH_SCRIPT; +$_SCRIPT_FOLDER/scripts/5_Configure_Binary_Tarball.sh $BINARY_TARBALL $_BINARY_TARBALL_TOGGLE_SETTINGS_SCRIPT $_BINARY_TARBALL_LAUNCH_SCRIPT; diff --git a/linux/binary_tarball/content/launch_librewolf.sh b/binary_tarball/content/launch_librewolf.sh similarity index 100% rename from linux/binary_tarball/content/launch_librewolf.sh rename to binary_tarball/content/launch_librewolf.sh diff --git a/linux/binary_tarball/toggle-settings.sh b/binary_tarball/content/toggle-settings.sh similarity index 100% rename from linux/binary_tarball/toggle-settings.sh rename to binary_tarball/content/toggle-settings.sh diff --git a/linux/binary_tarball/scripts/1_Install_Dependencies.sh b/binary_tarball/scripts/1_Install_Dependencies.sh similarity index 100% rename from linux/binary_tarball/scripts/1_Install_Dependencies.sh rename to binary_tarball/scripts/1_Install_Dependencies.sh diff --git a/linux/binary_tarball/scripts/2_Download_Source_Code.sh b/binary_tarball/scripts/2_Download_Source_Code.sh similarity index 100% rename from linux/binary_tarball/scripts/2_Download_Source_Code.sh rename to binary_tarball/scripts/2_Download_Source_Code.sh diff --git a/linux/binary_tarball/scripts/3_Configure_Source_Code.sh b/binary_tarball/scripts/3_Configure_Source_Code.sh similarity index 100% rename from linux/binary_tarball/scripts/3_Configure_Source_Code.sh rename to binary_tarball/scripts/3_Configure_Source_Code.sh diff --git a/linux/binary_tarball/scripts/4_Build_Binary_Tarball.sh b/binary_tarball/scripts/4_Build_Binary_Tarball.sh similarity index 100% rename from linux/binary_tarball/scripts/4_Build_Binary_Tarball.sh rename to binary_tarball/scripts/4_Build_Binary_Tarball.sh diff --git a/linux/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh similarity index 73% rename from linux/binary_tarball/scripts/5_Configure_Binary_Tarball.sh rename to binary_tarball/scripts/5_Configure_Binary_Tarball.sh index 293dc16..562b05e 100755 --- a/linux/binary_tarball/scripts/5_Configure_Binary_Tarball.sh +++ b/binary_tarball/scripts/5_Configure_Binary_Tarball.sh @@ -3,9 +3,10 @@ printf "\n\n--------------------------------- SETTINGS INTEGRATION ------------- # Setup Script Variables BINARY_TARBALL=$1; -SETTINGS_FOLDER=$2; +TOGGLE_SETTINGS_SCRIPT=$2l LAUNCHER_SCRIPT=$3; _EXTRACTED_TARBALL_FOLDER=./librewolf; +_SETTINGS_REPO='git@gitlab.com:librewolf-community/librewolf-settings.git'; # Extracts the binary tarball printf "\nExtracting librewolf binary tarball\n"; @@ -13,7 +14,9 @@ tar -xvf $BINARY_TARBALL; # Adds the librefox config files to the packaged tarball printf "\nCopying librewolf settings to extracted binary tarball\n"; -cp -r $SETTINGS_FOLDER $_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 diff --git a/linux/build.sh b/build.sh similarity index 100% rename from linux/build.sh rename to build.sh diff --git a/linux/flatpak/build_flatpak.sh b/flatpak/build_flatpak.sh similarity index 100% rename from linux/flatpak/build_flatpak.sh rename to flatpak/build_flatpak.sh diff --git a/linux/flatpak/content/io.gitlab.LibreWolf.json b/flatpak/content/io.gitlab.LibreWolf.json similarity index 100% rename from linux/flatpak/content/io.gitlab.LibreWolf.json rename to flatpak/content/io.gitlab.LibreWolf.json diff --git a/linux/README.md b/linux/README.md deleted file mode 100644 index f09f6af..0000000 --- a/linux/README.md +++ /dev/null @@ -1,14 +0,0 @@ -This folder contains all the required material to build the browser on Linux platforms. - -### Requirements -* Ubuntu or Linux Mint (Bionic or later) - -### Notes -* As this script installs files during the build, it is recommended to run this script in a VM or installation dedicated to building. -* You will occassionally need to enter your sudo password. Running this script as root has not been tested -* This script has been tested with Linux Mint 19.1 -* The flatpak build is not ready yet. - -### Instructions -* Run build.sh inside this folder. -* Packages will be saved in the repository root folder.