diff options
| -rwxr-xr-x | browser/linux/appimage/build_appimage.sh | 20 | ||||
| -rwxr-xr-x | browser/linux/binary_tarball/scripts/5_Configure_Binary_Tarball.sh | 12 | ||||
| -rwxr-xr-x | browser/linux/build.sh | 7 |
3 files changed, 23 insertions, 16 deletions
diff --git a/browser/linux/appimage/build_appimage.sh b/browser/linux/appimage/build_appimage.sh index 3efa9e8..57c1594 100755 --- a/browser/linux/appimage/build_appimage.sh +++ b/browser/linux/appimage/build_appimage.sh @@ -1,8 +1,8 @@ #!/bin/sh -APPIMAGE_CONTENT_FOLDER=$1 #$SCRIPT_FOLDER/resources/appimage; -BINARY_TARBALL=$2 -OUTPUT_FOLDER=$3 +BINARY_TARBALL=$1 +APPIMAGE_CONTENT_FOLDER=$2 +APPIMAGE_FILE=$3 _LIBREWOLF_EXTRACTED_FOLDER=./librewolf; _LIBREWOLF_FINAL_APPIMAGE=./LibreWolf*.AppImage; @@ -13,10 +13,9 @@ printf "\n\n------------------------------------ APPIMAGE BUILD ---------------- printf "APPIMAGE_RESOURCE_FOLDER: $APPIMAGE_CONTENT_FOLDER\n"; -# Copy and generate icons -# printf "\nGenerating AppImage Icons\n"; -# cp $ICON_FOLDER/icon.svg $APPIMAGE_CONTENT_FOLDER/librewolf.svg; -# ln -rs $APPIMAGE_CONTENT_FOLDER/librewolf.svg $SCRIPT_FOLDER/resources/appimage/.DirIcon; +# Extracts the binary tarball +printf "\nExtracting librewolf binary tarball\n"; +tar -xvf ./$BINARY_TARBALL; # Copy appimage resources to main tarball printf "Copying AppImage resources to binary tarball folder\n"; @@ -32,9 +31,12 @@ rm -f $_APPIMAGETOOL_FILE; # Generate AppImage printf "\nGenerating AppImage\n"; ./squashfs-root/AppRun $_LIBREWOLF_EXTRACTED_FOLDER; +rm -rf $_LIBREWOLF_EXTRACTED_FOLDER; rm -rf ./squashfs-root; chmod +x $_LIBREWOLF_FINAL_APPIMAGE; -# Move AppImage to build_output folder +# Move AppImage to specified location printf "\nMoving AppImage to build_output folder\n"; -mv $_LIBREWOLF_FINAL_APPIMAGE $OUTPUT_FOLDER; +mv $_LIBREWOLF_FINAL_APPIMAGE $APPIMAGE_FILE; + + diff --git a/browser/linux/binary_tarball/scripts/5_Configure_Binary_Tarball.sh b/browser/linux/binary_tarball/scripts/5_Configure_Binary_Tarball.sh index 346f702..f859f11 100755 --- a/browser/linux/binary_tarball/scripts/5_Configure_Binary_Tarball.sh +++ b/browser/linux/binary_tarball/scripts/5_Configure_Binary_Tarball.sh @@ -1,24 +1,24 @@ #!/bin/sh -PACKAGE_FILE=$1 -SETTINGS_FOLDER_TO_ADD=$2 #$REPOSITORY_FOLDER/settings -LAUNCHER_SCRIPT=$3 #$SCRIPT_FOLDER/resources/launch_librewolf.sh +BINARY_TARBALL=$1 +SETTINGS_FOLDER_TO_ADD=$2 +LAUNCHER_SCRIPT=$3 printf "\n\n--------------------------------- SETTINGS INTEGRATION --------------------------------------\n"; # Extracts the binary tarball printf "\nExtracting librewolf binary tarball\n"; -tar -xvf ./$PACKAGE_FILE; +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_TO_ADD ./librewolf/settings; -cp $LAUNCHER_SCRIPT ./librewolf/launch_librewolf.sh +cp $LAUNCHER_SCRIPT ./librewolf/launch_librewolf.sh; mkdir -p ./librewolf/defaults/pref/; mkdir -p ./librewolf/distribution/; # Repacks the binary tarball printf "\nRecompressing binary tarball\n"; -tar -jcvf ./$PACKAGE_FILE librewolf; +tar -jcvf ./$BINARY_TARBALL librewolf; diff --git a/browser/linux/build.sh b/browser/linux/build.sh index 5c839db..b44a321 100755 --- a/browser/linux/build.sh +++ b/browser/linux/build.sh @@ -10,9 +10,14 @@ SCRIPT_FOLDER=$(realpath $(dirname $0)) && printf "SCRIPT_FOLDER: $SCRIPT_FOLDER REPOSITORY_FOLDER=$(realpath $SCRIPT_FOLDER/../../) && printf "REPOSITORY_FOLDER: $REPOSITORY_FOLDER\n"; SOURCE_FOLDER=$SCRIPT_FOLDER/compile && printf "SOURCE_FOLDER: $SOURCE_FOLDER\n"; SOURCE_CONTENT_FOLDER=$REPOSITORY_FOLDER/browser/common/source_files/ && printf "SOURCE_CONTENT_FOLDER: $SOURCE_CONTENT_FOLDER\n"; -BINARY_TARBALL=$SCRIPT_FOLDER/LibreWolf.tar.bz2 && printf "BINARY_TARBALL: $BINARY_TARBALL\n"; +BINARY_TARBALL=$REPOSITORY_FOLDER/LibreWolf.tar.bz2 && printf "BINARY_TARBALL: $BINARY_TARBALL\n"; +APPIMAGE_FILE=$REPOSITORY_FOLDER/LibreWolf.AppImage $SCRIPT_FOLDER/binary_tarball/scripts/1_Install_Dependencies.sh; $SCRIPT_FOLDER/binary_tarball/scripts/2_Download_Source_Code.sh $SOURCE_FOLDER; $SCRIPT_FOLDER/binary_tarball/scripts/3_Configure_Source_Code.sh $SOURCE_FOLDER $SOURCE_CONTENT_FOLDER; $SCRIPT_FOLDER/binary_tarball/scripts/4_Build_Binary_Tarball.sh $SOURCE_FOLDER $BINARY_TARBALL; +$SCRIPT_FOLDER/binary_tarball/scripts/5_Configure_Binary_Tarball.sh $BINARY_TARBALL $REPOSITORY_FOLDER/settings $SCRIPT_FOLDER/binary_tarball/content/launch_librewolf.sh; + +$SCRIPT_FOLDER/appimage/build_appimage.sh $BINARY_TARBALL $SCRIPT_FOLDER/appimage/content $APPIMAGE_FILE; + |