Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a466ce89 authored by Frank Preel's avatar Frank Preel
Browse files

Merge from updated master

parents b2a93c23 57c51516

.gitlab-ci.yml

+3 −1
Original line number Diff line number Diff line
@@ -91,10 +91,12 @@ build-macos: 
    GIT_SUBMODULE_STRATEGY: recursive

  script:

    - ./gradlew jlink

    - cd Mac-build

    - ./mac_package.sh

  artifacts:

    name: "easy-installer-mac"

    paths:

      - build/image/easy-installer-mac/*

      - Mac-build/EasyInstaller.app



build-aur:

  image: $CONTAINER_IMAGE/aur:$CONTAINER_TAG

Mac-build/.DS_Store

0 → 100644
+6 KiB

File added.

No diff preview for this file type.

View file

Mac-build/EasyInstaller

0 → 100644
+4 −0
Original line number Diff line number Diff line 
#!/bin/bash



DIR="${0%/*}"

"$DIR/bin/java"  -p "$DIR/../app" -m ecorp.easy.installer/ecorp.easy.installer.EasyInstaller  "$@"

Mac-build/mac_package.sh

0 → 100755
+15 −0
Original line number Diff line number Diff line 
#!/bin/bash



APPNAME=EasyInstaller

DIR="$APPNAME.app/Contents/MacOS"



if [ -a "$APPNAME.app" ]; then

	echo "$PWD/$APPNAME.app already exists :("

	exit 1

fi



mkdir -p "$DIR"

cp EasyInstaller "$DIR/$APPNAME"

chmod +x "$DIR/$APPNAME"



cp -r ../build/image/easy-installer-mac/* "$DIR"

README.md

+3 −4
Original line number Diff line number Diff line 
# Easy Installer

**Current Version:** v0.13.4-beta

**Current released Version:** v0.13.4-beta

**Current Version:** v0.15.0

**Current released Version:** v0.13.3-beta



Members:

- Gaël
@@ -65,9 +65,8 @@ developer: 
- MacOS support

- Cosmetic bugfix (386)

- Fix username with spaces issue on Windows

- 



### v0.13.4-beta (current - unreleased)

### v0.13.4-beta (unreleased)

- Fix Ubuntu build's docker image - by Israel & Omer Akram & Nicolas

- Refactor classes related to script execution

- Update Russian translations - by Nikolay Sinyov