better AppImage support

Author: ddmitov

CREDITS.md

@@ -144,6 +144,7 @@ http://stackoverflow.com/questions/17680207/qhash-iterator-example-no-match-for-
 https://stackoverflow.com/questions/23174393/parse-jsonarray  
 https://stackoverflow.com/questions/24899558/how-to-check-qt-version-to-include-different-header  
 https://stackoverflow.com/questions/19822211/qt-parsing-json-using-qjsondocument-qjsonobject-qjsonarray  
+https://stackoverflow.com/questions/2241808/checking-if-a-folder-exists-and-creating-folders-in-qt-c  
 
 http://www.java2s.com/Code/Cpp/Qt/CheckfileexistanceandfilenamewithQFile.htm  
 http://webkit.sed.hu/content/disabling-cache  
@@ -227,6 +228,8 @@ https://stackoverflow.com/questions/10319652/check-if-a-file-is-executable
 https://stackoverflow.com/questions/10376206/what-is-the-preferred-bash-shebang  
 
 https://unix.stackexchange.com/questions/312280/split-string-by-delimiter-and-get-n-th-element  
+https://unix.stackexchange.com/questions/12453/how-to-determine-linux-kernel-architecture  
+
 https://www.cyberciti.biz/faq/unix-linux-bsd-appleosx-bash-assign-variable-command-output/  
 https://www.tutorialspoint.com/unix/unix-regular-expressions.htm  
 http://ryanstutorials.net/bash-scripting-tutorial/bash-functions.php  

SETTINGS.md

@@ -216,9 +216,9 @@ select_file.receiverFunction = function (file) {
   Any new directory will be created immediately by PEB.
 
 ## Minimal Portable Perl Distribution for PEB
-Sometimes it is important to minimize the size of the relocatable (or portable) Perl distribution used by a PEB-based application. [Perl Distribution Compactor](sdk/compactor.pl) is one solution to this problem. It finds all dependencies of all Perl scripts in the ``{PEB_binary_directory}/resources/app`` directory and copies them in a new ``{PEB_binary_directory}/perl/lib`` folder; a new ``{PEB_binary_directory}/perl/bin`` is also created. The original ``bin`` and ``lib`` folders are saved as ``bin-original`` and ``lib-original`` respectively. These directories should be manually archived for future use or removed.  
+Sometimes it is important to minimize the size of the relocatable (or portable) Perl distribution used by a PEB-based application. [Perl Distribution Compactor](sdk/compactor.pl) is one solution to this problem. It finds all dependencies of all Perl scripts in the ``{PEB_binary_directory}/resources/app`` directory and copies them in a new ``{PEB_binary_directory}/perl/lib`` folder; a new ``{PEB_binary_directory}/perl/bin`` is also created. The original ``bin`` and ``lib`` folders may be saved as ``bin-original`` and ``lib-original`` respectively.  
 
-Perl Distribution Compactor should be started from the directory of the browser binary using [compactor.sh](compactor.sh) on a Linux or a Mac machine or [compactor.cmd](compactor.cmd) on a Windows machine to ensure that only the Perl distribution of PEB is used. This is necessary to avoid dependency mismatches with any other Perl on PATH.  
+Perl Distribution Compactor should be started using [compactor.sh](sdk/compactor.sh) on a Linux or a Mac machine or [compactor.cmd](sdk/compactor.cmd) on a Windows machine to ensure that only the Perl distribution of PEB is used. This is necessary to avoid dependency mismatches with any other Perl on PATH.  
 
 Perl Distribution Compactor depends on [Module::ScanDeps](https://metacpan.org/pod/Module::ScanDeps) and [File::Copy::Recursive](https://metacpan.org/pod/File::Copy::Recursive) CPAN modules, which are included in the ``{PEB_binary_directory}/sdk/lib`` folder.
 

appimage-maker.sh

@@ -0,0 +1,43 @@
+#!/usr/bin/env bash
+
+cd .. || exit
+
+if [ ! -e ./peb.app ]; then
+  mkdir ./peb.app
+fi
+
+if [ -e ./peb ]; then
+  cp -f ./peb ./peb.app/peb
+else
+  cd ./src || exit
+
+  qmake -qt=qt5
+  make
+
+  cd .. || exit
+  cp -f ./peb ./peb.app/peb
+fi
+
+cp ./sdk/peb.desktop ./peb.app/peb.desktop
+cp ./src/resources/icon/camel.png ./peb.app/peb.png
+
+cp -rf ./resources ./peb.app/resources
+
+relocatable_perl="$(pwd)/perl/bin/perl"
+compactor_script="$(pwd)/sdk/compactor.pl"
+
+if [ -e "$relocatable_perl" ]; then
+  printf "\\nGoing to compact the relocatable Perl for this copy of Perl Executing Browser.\\n"
+  "$relocatable_perl" "$compactor_script" "--AppImage"
+else
+  printf "\\nRelocatable Perl is not found for this copy of Perl Executing Browser.\\n"
+fi
+
+linuxdeployqt="linuxdeployqt-continuous-$(arch).AppImage"
+
+if [ ! -x "$linuxdeployqt" ]; then
+  wget --tries=5 --unlink "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/$linuxdeployqt"
+  chmod -v a+x "$linuxdeployqt"
+fi
+
+"./$linuxdeployqt" ./peb.app/peb -qmake='qmake -qt=qt5' -no-translations -appimage

sdk/appimage-maker.sh

@@ -1,3 +1,4 @@
+cd ..
 
 IF EXIST ./perl/bin/perl.exe (
   ECHO Going to compact the relocatable Perl for this copy of Perl Executing Browser.

compactor.cmd renamed to sdk/compactor.cmd

@@ -27,9 +27,18 @@
 my $app_directory = catdir($root, "resources", "app");
 my $perl_directory = catdir($root, "perl");
 my $bin_original = catdir($perl_directory, "bin");
-my $bin_compacted = catdir($perl_directory, "bin-compacted");
 my $lib_original = catdir($perl_directory, "lib");
-my $lib_compacted = catdir($perl_directory, "lib-compacted");
+
+my $bin_compacted;
+my $lib_compacted;
+
+if ($ARGV[0] and $ARGV[0] =~ /^--AppImage$/) {
+  $bin_compacted = catdir($root, "peb.app", "perl", "bin");
+  $lib_compacted = catdir($root, "peb.app", "perl", "lib");
+} else {
+  $bin_compacted = catdir($perl_directory, "bin-compacted");
+  $lib_compacted = catdir($perl_directory, "lib-compacted");
+}
 
 # Copying the Perl interpreter:
 if ($Config{osname} !~ "MSWin32") {
@@ -57,7 +66,8 @@
   print "Script Nr. $script_counter: $script\n";
 
   my $dependencies_hashref =
-    scan_deps (files => [$script], recurse => 3, compile => 'true');
+    scan_deps(files => [$script], recurse => 3,
+              compile => 'true', warn_missing => 1);
 
   my $module_counter;
   while (my($partial_path, $module_name) = each(%{$dependencies_hashref})) {
@@ -77,16 +87,18 @@
 }
 
 # Rename Perl directories:
-rename $bin_original, catdir($perl_directory, "bin-original");
-rename $bin_compacted, catdir($perl_directory, "bin");
+if ($ARGV[0] and $ARGV[0] !~ /^--AppImage$/) {
+  rename $bin_original, catdir($perl_directory, "bin-original");
+  rename $bin_compacted, catdir($perl_directory, "bin");
 
-rename $lib_original, catdir($perl_directory, "lib-original");
-rename $lib_compacted, catdir($perl_directory, "lib");
+  rename $lib_original, catdir($perl_directory, "lib-original");
+  rename $lib_compacted, catdir($perl_directory, "lib");
 
-# Remove backup directories if the script is started with the '--nobackup' flag.
-if ($ARGV[0] and $ARGV[0] =~ /^--nobackup$/) {
-  rmtree(catdir($perl_directory, "bin-original"));
-  rmtree(catdir($perl_directory, "lib-original"));
+  # Remove backup directories if the script is started with the '--no-backup' flag.
+  if ($ARGV[0] and $ARGV[0] =~ /^--no-backup$/) {
+    rmtree(catdir($perl_directory, "bin-original"));
+    rmtree(catdir($perl_directory, "lib-original"));
+  }
 }
 
 # Perl scripts recursive lister subroutine:

sdk/compactor.pl

@@ -1,5 +1,7 @@
 #!/usr/bin/env bash
 
+cd .. || exit
+
 relocatable_perl="./perl/bin/perl"
 
 if [ -e "$relocatable_perl" ]; then

compactor.sh renamed to sdk/compactor.sh

@@ -1,5 +1,7 @@
 #!/bin/sh
 
+cd .. || exit 1
+
 makedmg_version='v0.3'
 macdeployqt_bin=$(which macdeployqt)
 peb_bundle=$1
@@ -12,7 +14,7 @@ require_bundle_config() {
     echo "Please, set BUNDLE=1 in $peb_pro file and rebuild project."
     echo
     echo "Here is one liner to update your configuration: "
-    echo "   perl -pi -e s,BUNDLE=0,BUNDLE=1,g $peb_pro"
+    echo "perl -pi -e s,BUNDLE=0,BUNDLE=1,g $peb_pro"
     echo
     exit 1
   fi
@@ -35,7 +37,7 @@ require_bundle_config
 
 if [ -z "$macdeployqt_bin" ]
   then
-  echo "No macdeployqt found in PATH"
+  echo "No macdeployqt found in PATH."
   if [ -z "$QTDIR" ]
     then
     echo "Need to set QTDIR environment variable."
@@ -44,8 +46,8 @@ if [ -z "$macdeployqt_bin" ]
     set QTDIR = $qtdirname
     if [ -z "$QTDIR" ]
       then
-      echo "No QTDIR was set. I have quit now."
-      exit
+      echo "No QTDIR was set. I have to quit now."
+      exit 1
     fi
     echo ""
   fi