diff options
| author | Kali Kaneko <kali@leap.se> | 2014-06-17 11:25:11 -0500 |
|---|---|---|
| committer | Kali Kaneko <kali@leap.se> | 2014-06-17 13:15:39 -0500 |
| commit | 89d126e96b1ed3ac1076b3c45129f8bc78a09700 (patch) | |
| tree | 02c28c675a9883d52360acac53d4158f4c36459d /pkg | |
| parent | 9dd06067e6bfa475c633a1edcae8d3c318b9f0f5 (diff) | |
use bash installer instead of the temporal script
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/linux/README.rst | 7 | ||||
| -rwxr-xr-x | pkg/linux/leap-install-helper.sh | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/pkg/linux/README.rst b/pkg/linux/README.rst index 249c721f..f89842d3 100644 --- a/pkg/linux/README.rst +++ b/pkg/linux/README.rst @@ -15,10 +15,15 @@ path will be used if the flag ``--standalone`` is set:: bitmask-root -> /usr/local/sbin/bitmask-root polkit/se.leap.bitmask.bundle.policy -> /usr/share/polkit-1/actions/se.leap.bitmask.bundle.policy -You will also have to place an openvpn binary in the following path:: +When running with ``--standalone`` flag, the openvpn binary is expected in the following path:: leap-openvpn -> /usr/local/sbin/leap-openvpn +The bundle will use the script ``leap-install-helper.sh`` to copy the needed +files. If you ever want to use it manually to update the helpers or bins, it +needs a ``--from-path`` parameter to be passed to it. This points to a folder +from where all the needed binaries and scripts can be found. + Binary hashing ============== diff --git a/pkg/linux/leap-install-helper.sh b/pkg/linux/leap-install-helper.sh index bed48255..566dd3d9 100755 --- a/pkg/linux/leap-install-helper.sh +++ b/pkg/linux/leap-install-helper.sh @@ -19,8 +19,9 @@ LOCAL_SBIN_FOLDER=/usr/local/sbin +POLKIT_FOLDER="/usr/share/polkit-1/actions" POLKIT_FILE="se.leap.bitmask.bundle.policy" -POLKIT_PATH="/usr/share/polkit-1/actions" +POLKIT_PATH="${POLKIT_FOLDER}/${POLKIT_FILE}" BITMASK_ROOT_FILE="bitmask-root" BITMASK_ROOT_PATH="${LOCAL_SBIN_FOLDER}/${BITMASK_ROOT_FILE}" |