Skip to content

Commit

Permalink
correct application directory for AppImage executables
Browse files Browse the repository at this point in the history
  • Loading branch information
ddmitov committed Dec 29, 2019
1 parent d968d93 commit ad6354a
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 7 deletions.
1 change: 1 addition & 0 deletions README.md
Expand Up @@ -26,6 +26,7 @@ Perl Executing Browser (PEB) is an HTML5 user interface for [Perl 5](https://www
* [Perl Scripts API](./doc/SETTINGS.md#perl-scripts-api)
* [Files and Folders Dialogs API](./doc/SETTINGS.md#files-and-folders-dialogs-api)
* INTERACTIVE PERL SCRIPTS
* [PEB Interactive Perl Scripts](./doc/INTERACTIVE.md#peb-interactive-perl-scripts)
* [Requirements for Interactive Perl Scripts](./doc/INTERACTIVE.md#requirements-for-interactive-perl-scripts)
* [Examples of Interactive Perl Scripts](./doc/INTERACTIVE.md#examples-of-interactive-perl-scripts)
* APPIMAGE SUPPORT
Expand Down
2 changes: 1 addition & 1 deletion doc/APPIMAGE.md
Expand Up @@ -35,7 +35,7 @@ sudo docker container run --rm -it -v $(pwd):/opt --user $(id -u):$(id -g) peb-a
When PEB AppImage Builder Docker Container is running, type:

```bash
cd /opt/src && qmake -qt=qt5 && make && cd .. && export VERSION="1.1.0" && ./appimager.sh && exit
cd /opt/src && qmake -qt=qt5 && make && cd .. && export VERSION="1.1.1" && ./appimager.sh && exit
```

## AppImageHub
Expand Down
4 changes: 3 additions & 1 deletion doc/INTERACTIVE.md
@@ -1,6 +1,8 @@
# Perl Executing Browser - Interactive Perl Scripts

PEB interactive Perl scripts are able to receive user input multiple times after the script is started by waiting for new data on STDIN or in a temporary file. Many interactive scripts can be started simultaneously in one PEB instance. One script may be started in many instances, provided that each of them has a JavaScript settings object with an unique name.
## PEB Interactive Perl Scripts

PEB interactive Perl scripts are able to receive user input multiple times after the script is started by waiting for new data on STDIN or in a temporary file. Many interactive scripts can be started simultaneously by one PEB instance. One script may be started in many instances, provided that each of them has a JavaScript settings object with an unique name.

## Requirements for Interactive Perl Scripts

Expand Down
5 changes: 3 additions & 2 deletions src/main.cpp
Expand Up @@ -31,7 +31,7 @@ int main(int argc, char **argv)
// ==============================
// Application version:
// ==============================
application.setApplicationVersion("1.1.0");
application.setApplicationVersion("1.1.1");

// ==============================
// UTF-8 encoding application-wide:
Expand Down Expand Up @@ -60,7 +60,8 @@ int main(int argc, char **argv)
// ==============================
// Application directory:
// ==============================
QString applicationDirName = browserDirectory + "/resources/app";
QString applicationDirName =
executableDirectory.absolutePath().toLatin1() + "/resources/app";
application.setProperty("appDir", applicationDirName);

// ==============================
Expand Down
6 changes: 3 additions & 3 deletions src/resources/peb.rc
Expand Up @@ -3,8 +3,8 @@ IDI_ICON1 ICON DISCARDABLE "icon/camel.ico"
# include <winver.h>

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,1,0,0
PRODUCTVERSION 1,1,0,0
FILEVERSION 1,1,1,0
PRODUCTVERSION 1,1,1,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS VS_FF_DEBUG
Expand All @@ -21,7 +21,7 @@ VS_VERSION_INFO VERSIONINFO
BEGIN
VALUE "CompanyName", "PEB Dev Team\0"
VALUE "FileDescription", "Perl Executing Browser\0"
VALUE "FileVersion", "1.1.0.0\0"
VALUE "FileVersion", "1.1.1.0\0"
VALUE "LegalCopyright", "LGPL v.3\0"
VALUE "OriginalFilename", "peb.exe\0"
VALUE "ProductName", "Perl Executing Browser\0"
Expand Down

0 comments on commit ad6354a

Please sign in to comment.