summaryrefslogtreecommitdiff
path: root/app-admin/calamares
diff options
context:
space:
mode:
authorV3n3RiX <venerix@rogentos.ro>2016-08-08 17:33:04 +0100
committerV3n3RiX <venerix@rogentos.ro>2016-08-08 17:33:04 +0100
commitaa2d091247be0d04a481af1a579465183a7a3f37 (patch)
tree8738447eb5a0a2862590242a5cbd8199b46a8275 /app-admin/calamares
parent973ef3d0835d10e540b524c60b64c99e62041dac (diff)
fix installer doesn't start from desktop launcher
Diffstat (limited to 'app-admin/calamares')
-rw-r--r--app-admin/calamares/calamares-2.3-r5.ebuild (renamed from app-admin/calamares/calamares-2.3-r4.ebuild)10
-rwxr-xr-xapp-admin/calamares/files/calamares-pkexec7
2 files changed, 17 insertions, 0 deletions
diff --git a/app-admin/calamares/calamares-2.3-r4.ebuild b/app-admin/calamares/calamares-2.3-r5.ebuild
index 3366b1c0..935a9551 100644
--- a/app-admin/calamares/calamares-2.3-r4.ebuild
+++ b/app-admin/calamares/calamares-2.3-r5.ebuild
@@ -52,6 +52,9 @@ src_prepare() {
epatch ${FILESDIR}/${PN}-kogaion-dracut-call.patch
# replace calamares installer desktop icon
sed -i "s/Icon=calamares/Icon=start-here/g" "${S}/calamares.desktop"
+ # fix installer doesn't start from desktop launcher (IMPROVE THIS UGLY THINGY)
+ sed -i "s/pkexec //g" "${S}/calamares.desktop"
+ sed -i "s/calamares/calamares-pkexec/g" "${S}/calamares.desktop"
# If qtchooser is installed, it may break the build, because moc,rcc and uic binaries for wrong qt version may be used.
# Setting QT_SELECT environment variable will enforce correct binaries (fix taken from vlc ebuild)
export QT_SELECT=qt5
@@ -63,3 +66,10 @@ src_configure() {
)
cmake-utils_src_configure
}
+
+src_install() {
+ cmake-utils_src_install
+ insinto /usr/bin
+ insopts -m 755
+ doins ${FILESDIR}/calamares-pkexec
+}
diff --git a/app-admin/calamares/files/calamares-pkexec b/app-admin/calamares/files/calamares-pkexec
new file mode 100755
index 00000000..16334252
--- /dev/null
+++ b/app-admin/calamares/files/calamares-pkexec
@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+main() {
+ pkexec /usr/bin/calamares
+}
+
+main