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

Commit cb1e754a authored by Arnau Vàzquez's avatar Arnau Vàzquez
Browse files

Launcher renamed

parent eae579ea

Dockerfile

+4 −4
Original line number Diff line number Diff line
@@ -75,11 +75,11 @@ RUN curl -fsSL -o ecloud-theme-helper.tar.gz \ 
    mv "${BASE_DIR}/custom_apps/ecloud-theme-helper-${THEME_HELPER_VERSION}" "${BASE_DIR}/custom_apps/ecloud-theme-helper" && \

    rm ecloud-theme-helper.tar.gz;



RUN curl -fsSL -o ecloud-launcher.zip \

RUN curl -fsSL -o murena_launcher.zip \

    "https://gitlab.e.foundation/e/infra/ecloud/nextcloud-apps/launcher/-/jobs/${ECLOUD_LAUNCHER_JOB_ID}/artifacts/download" && \

    unzip ecloud-launcher.zip && \

    mv dist/ecloud-launcher ${BASE_DIR}/custom_apps/ && \

    rm ecloud-launcher.zip;

    unzip murena_launcher.zip && \

    mv dist/murena_launcher ${BASE_DIR}/custom_apps/ && \

    rm murena_launcher.zip;



RUN curl -fsSL -o integration_google.tar.gz \

    "https://github.com/nextcloud/integration_google/releases/download/v${GOOGLE_INTEGRATION_VERSION}/integration_google-${GOOGLE_INTEGRATION_VERSION}.tar.gz" && \

custom_entrypoint.sh

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ if version_greater "$image_version" "$installed_version"; then 
    rsync $rsync_options --include "/email-recovery/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/ecloud-accounts/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/ecloud-theme-helper/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/ecloud-launcher/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/murena_launcher/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/

    rsync $rsync_options --include "/integration_google/" --exclude '/*' $SRC_DIR/custom_apps/ $DST_DIR/custom_apps/



    rsync $rsync_options --include "/eCloud/" --exclude '/*' $SRC_DIR/themes/ $DST_DIR/themes/
@@ -38,7 +38,7 @@ fi 


if [ "$(id -u)" = 0 ]; then

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:disable apporder"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-launcher"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable murena_launcher"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-theme-helper"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:disable ecloud_drop_account"

    su -p www-data -s /bin/sh -c "php $DST_DIR/occ app:enable ecloud-accounts"