diff --git a/docker-builder-data/build/script/packet/appimagekit-master.sh b/docker-builder-data/build/script/packet/appimagekit-master.sh index 6629118..320064a 100644 --- a/docker-builder-data/build/script/packet/appimagekit-master.sh +++ b/docker-builder-data/build/script/packet/appimagekit-master.sh @@ -1,31 +1,43 @@ -DEPS="png-1.6.26 cmake-3.6.2" +DEPS="" PK_DIRNAME="AppImageKit" PK_URL="https://github.com/probonopd/$PK_DIRNAME.git" -source $INCLUDE_SCRIPT_DIR/inc-pkallunpack-git.sh +source $INCLUDE_SCRIPT_DIR/inc-pkunpack-git.sh + +pkdownload() { + if [ -d "$DOWNLOAD_PACKET_DIR/$PK_DIRNAME/.git" ]; then + cd "$DOWNLOAD_PACKET_DIR/$PK_DIRNAME" || return 1 + git fetch || return 1 + git reset --hard origin/$(git rev-parse --abbrev-ref HEAD) || return 1 + git submodule update || return 1 + else + git clone "$PK_URL" $PK_GIT_OPTIONS || return 1 + cd "$DOWNLOAD_PACKET_DIR/$PK_DIRNAME" || return 1 + git submodule init || return 1 + git submodule update || return 1 + fi +} pkbuild() { - cd "$BUILD_PACKET_DIR/$PK_DIRNAME" - + cd "$BUILD_PACKET_DIR/$PK_DIRNAME" if ! check_packet_function $NAME build.configure; then - if ! cmake -DCMAKE_INSTALL_PREFIX:PATH=$INSTALL_PACKET_DIR .; then - return 1 - fi + cp -p shared.c shared.c.tmp || return 1 + mv -f shared.c.tmp shared.c || return 1 + cp -p build.sh build.sh.tmp || return 1 + mv -f build.sh.tmp build.sh || return 1 + sed -i -e 's|archive3.h|archive.h|g' ./shared.c || return 1 + sed -i -e 's|archive_entry3.h|archive_entry.h|g' ./shared.c || return 1 + sed -i -e 's|-larchive3|-larchive|g' ./build.sh || return 1 + sed -i -e 's|git submodule|#git submodule|g' ./build.sh || return 1 + sed -i -e 's|wget -c|wget -c --no-check-certificate|g' ./build.sh || return 1 + sed -i -e 's|automake|#automake|g' ./build.sh || return 1 set_done $NAME build.configure - fi - - if ! make -j${THREADS}; then - return 1 fi + bash -ex ./build.sh || return 1 } pkinstall() { mkdir -p "$INSTALL_PACKET_DIR/bin" - if ! (cp --remove-destination "$BUILD_PACKET_DIR/$PK_DIRNAME/AppImageAssistant" "$INSTALL_PACKET_DIR/bin/" \ - && cp --remove-destination "$BUILD_PACKET_DIR/$PK_DIRNAME/AppRun" "$INSTALL_PACKET_DIR/bin/" \ - && cp --remove-destination "$BUILD_PACKET_DIR/$PK_DIRNAME/desktopintegration" "$INSTALL_PACKET_DIR/bin/" \ - && chmod a+x "$INSTALL_PACKET_DIR/bin/desktopintegration"); then - return 1 - fi + cp --remove-destination $BUILD_PACKET_DIR/$PK_DIRNAME/build/* "$INSTALL_PACKET_DIR/bin/" || return 1 } diff --git a/docker/debian-7-32bit/Dockerfile b/docker/debian-7-32bit/Dockerfile index 261925d..b566d09 100644 --- a/docker/debian-7-32bit/Dockerfile +++ b/docker/debian-7-32bit/Dockerfile @@ -61,5 +61,7 @@ RUN apt-get -yq install libxtst-dev RUN apt-get -yq install xutils-dev RUN apt-get -yq install libegl1-mesa-dev RUN apt-get -yq install libdirectfb-dev +RUN apt-get -yq install libarchive-dev +RUN apt-get -yq install zsync RUN mkdir /build diff --git a/docker/debian-7-64bit/Dockerfile b/docker/debian-7-64bit/Dockerfile index 994f88f..87ed8cf 100644 --- a/docker/debian-7-64bit/Dockerfile +++ b/docker/debian-7-64bit/Dockerfile @@ -60,5 +60,7 @@ RUN apt-get -yq install libxtst-dev RUN apt-get -yq install xutils-dev RUN apt-get -yq install libegl1-mesa-dev RUN apt-get -yq install libdirectfb-dev +RUN apt-get -yq install libarchive-dev +RUN apt-get -yq install zsync RUN mkdir /build