From b87abdb5726972abcaef0edcbf58e566e93897ca Mon Sep 17 00:00:00 2001 From: Yuto Tokunaga Date: Wed, 21 Aug 2019 12:49:41 +0900 Subject: [PATCH] =?UTF-8?q?docker=20build=E3=81=A7mikutter/execso=E3=81=8B?= =?UTF-8?q?=E3=82=89exec.so=E3=82=92=E5=8F=96=E5=BE=97=E3=81=99=E3=82=8B?= =?UTF-8?q?=E3=82=88=E3=81=86=E3=81=AB=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deployment/appimage/Dockerfile | 5 +++++ deployment/appimage/gen_appimage.sh | 7 ------- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/deployment/appimage/Dockerfile b/deployment/appimage/Dockerfile index 839ec539..b003ef5e 100644 --- a/deployment/appimage/Dockerfile +++ b/deployment/appimage/Dockerfile @@ -39,6 +39,11 @@ RUN wget -q https://cache.ruby-lang.org/pub/ruby/2.6/ruby-$ruby_version.tar.gz & make "DESTDIR=$APPDIR" install && \ cp -v BSDL COPYING* GPL LEGAL README* $APPDIR/usr/lib/ruby +# use exec.so to run commands placed outside of the AppImage +# see https://github.com/darealshinji/AppImageKit-checkrt/pull/11 +RUN mkdir $APPDIR/usr/optional \ + && wget -q -O $APPDIR/usr/optional/exec.so https://github.com/mikutter/execso/releases/download/2019-08-20/exec-x86_64-gnu-linux.so + COPY AppRun mikutter.desktop gen_appimage.sh / ENV VOLUME /volume diff --git a/deployment/appimage/gen_appimage.sh b/deployment/appimage/gen_appimage.sh index a6deffc9..5f3ef191 100755 --- a/deployment/appimage/gen_appimage.sh +++ b/deployment/appimage/gen_appimage.sh @@ -39,13 +39,6 @@ echo "--> copy mikutter" mkdir -p $APPDIR/usr/share/mikutter cp -av "$BUILD_DIR"/{.bundle,core,mikutter.rb,Gemfile,LICENSE,README} $APPDIR/usr/share/mikutter -echo "--> get exec.so" -# use darealshinji/AppImageKit-checkrt's exec.so to exec xdg-open placed -# outside of the AppImage -# see https://github.com/darealshinji/AppImageKit-checkrt/pull/11 -mkdir -p $APPDIR/usr/optional || true -wget -q -O $APPDIR/usr/optional/exec.so https://github.com/darealshinji/AppImageKit-checkrt/releases/download/continuous/exec-x86_64.so - echo "--> copy Typelibs for gobject-introspection gem" cp -av /usr/lib/girepository-* $APPDIR/usr/lib -- 2.22.1