Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

correct link; change to appimagetool #560

Draft
wants to merge 1 commit into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ chmod +x ./pkg2appimage-*.AppImage
./pkg2appimage-*.AppImage Spotify
```

`.yml` recipes tell pkg2appimage where to get the ingredients from, and how to convert them to an AppImage. Study some [examples](https://github.com/AppImage/AppImages/tree/master/recipes) to see how it works.
`.yml` recipes tell pkg2appimage where to get the ingredients from, and how to convert them to an AppImage. Study some [examples](https://github.com/AppImageCommunity/pkg2appimage/tree/master/recipes) to see how it works.

To build an AppImage from a local `.yml` recipe (e.g., during development):

Expand Down
6 changes: 3 additions & 3 deletions YML.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ This document provides an introduction to the `.yml` files' purpose, their struc

YAML's approach to describing data is to combine associative lists (known as `dict`s in Python or `object literal`s in JavaScript, for example), lists (arrays) and scalar values. This results in an easy to parse and also easy to read format.

The `.yml` files are used by [`pkg2appimage`](https://github.com/AppImage/AppImages/blob/master/pkg2appimage) which is used in the _AppImages_ project to convert binary _ingredients_ into AppImages for demonstration purposes. Their primary objective is to make it very simple to convert pre-existing binaries into the AppImage format. If you can build your software from source, you may generate AppImages directly as part of your build workflow; in this case you may not need a `.yml` file (but a Travis CI `.travis.yml` and/or a `Makefile`, etc.).
The `.yml` files are used by [`pkg2appimage`](https://github.com/AppImageCommunity/pkg2appimage/blob/master/pkg2appimage) which is used in the _AppImages_ project to convert binary _ingredients_ into AppImages for demonstration purposes. Their primary objective is to make it very simple to convert pre-existing binaries into the AppImage format. If you can build your software from source, you may generate AppImages directly as part of your build workflow; in this case you may not need a `.yml` file (but a Travis CI `.travis.yml` and/or a `Makefile`, etc.).

The `.yml` file format is not part of the AppImage standard, which just describes the AppImage container format and is agnostic as to how the payload inside an AppImage gets generated. Neither it is part of AppImageKit, because AppImageKit is only concerned with taking a pre-existing _AppDir_ and converting that into an AppImage. Such an AppDir is created from the instructions stored in the `.yml` files, and converted to an AppImage using _AppImageKit_.

Expand Down Expand Up @@ -95,7 +95,7 @@ ingredients:

The `dist` section inside the `ingredients` section defines which Debian distribution should be used as a base. The `sources` section inside the `ingredients` section describes the repositories from which the package should be pulled. The entries are in the same format as lines in a debian `sources.list` file. Note that the `http://download.opensuse.org/repositories/isv:/KDAB/xUbuntu_14.04` repository needs the `http://archive.ubuntu.com/ubuntu/` repository so that the dependencies can be resolved.

__NOTE:__ In the future, other types of packages like `.rpm` could also be included in the `.yml` file definition. Proposals for this are welcome if the proposer also implements support for this in the [`pkg2appimage`](https://github.com/AppImage/AppImages/blob/master/pkg2appimage) script.
__NOTE:__ In the future, other types of packages like `.rpm` could also be included in the `.yml` file definition. Proposals for this are welcome if the proposer also implements support for this in the [`pkg2appimage`](https://github.com/AppImageCommunity/pkg2appimage/blob/master/pkg2appimage) script.


#### Using ingredients from an Ubuntu PPA
Expand All @@ -113,7 +113,7 @@ ingredients:

The `ppas` section inside the `ingredients` section lets you specify one or more Ubuntu PPAs. This is equivalent to, but more elegant than, adding the corresponding `sources.list` entries to the `sources` section inside the `ingredients` section.

__NOTE:__ In the future, similar shortcuts for other types of personal repositories, such as projects on openSUSE build service, could also be included in the `.yml` file definition. Proposals for this are welcome if the proposer also implements support for this in the [`pkg2appimage`](https://github.com/AppImage/AppImages/blob/master/pkg2appimage) script.
__NOTE:__ In the future, similar shortcuts for other types of personal repositories, such as projects on openSUSE build service, could also be included in the `.yml` file definition. Proposals for this are welcome if the proposer also implements support for this in the [`pkg2appimage`](https://github.com/AppImageCommunity/pkg2appimage/blob/master/pkg2appimage) script.

#### Using deb files from a download page

Expand Down
2 changes: 1 addition & 1 deletion bintray.sh
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ BINTRAY_API_KEY="$BINTRAY_API_KEY" # env
BINTRAY_REPO="${BINTRAY_REPO:-AppImages}"
BINTRAY_REPO_OWNER="${BINTRAY_REPO_OWNER:-$BINTRAY_USER}" # owner and user not always the same
WEBSITE_URL="${WEBSITE_URL:-http://appimage.org}"
ISSUE_TRACKER_URL="${ISSUE_TRACKER_URL:-https://github.com/AppImage/AppImages/issues}"
ISSUE_TRACKER_URL="${ISSUE_TRACKER_URL:-https://github.com/AppImageCommunity/pkg2appimage/issues}"
VCS_URL="${VCS_URL:-https://github.com/AppImage/AppImages.git}" # Mandatory for packages in free Bintray repos

# Figure out whether we should use sudo
Expand Down
4 changes: 2 additions & 2 deletions excludedeblist
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ libc6-dev
libcairo2
libcups2
# libcurl3 # Does draw in a lot of libs including security relevant ones; e.g., in supertux2; but otherwise get ../lib/x86_64-linux-gnu/libssl.so.1.0.0: version `OPENSSL_1.0.2' not found (required by /usr/lib/x86_64-linux-gnu/libcurl.so.4)
# libcurl3-gnutls # https://github.com/AppImage/AppImages/issues/120#issuecomment-261749714
# libcurl3-gnutls # https://github.com/AppImageCommunity/pkg2appimage/issues/120#issuecomment-261749714
# libdbm2 # seems not to exist
libdbus-1-3
libdrm2
Expand Down Expand Up @@ -65,7 +65,7 @@ libstdc++6
libtasn1-6
libwayland-egl1-mesa # e.g., OpenRA
lsb-base
libxcb1 # Workaround for: Fedora 25: undefined symbol: xcb_send_request_with_fds, https://github.com/AppImage/AppImages/issues/128
libxcb1 # Workaround for: Fedora 25: undefined symbol: xcb_send_request_with_fds, https://github.com/AppImageCommunity/pkg2appimage/issues/128
mime-support
passwd
udev
Expand Down
12 changes: 6 additions & 6 deletions excludelist
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ libxcb.so.1
# Uncertain if this is required to be bundled for some distributions - if so we need to write a version check script and use LD_PRELOAD to load the system version if it is newer
# Fedora 25:
# undefined symbol: xcb_send_request_with_fds
# https://github.com/AppImage/AppImages/issues/128
# https://github.com/AppImageCommunity/pkg2appimage/issues/128

libX11.so.6
# Workaround for:
Expand Down Expand Up @@ -152,7 +152,7 @@ libharfbuzz.so.0
# echo "extern int is_selinux_enabled(void){return 0;}" >> selinux-mock.c
# gcc -s -shared -o libselinux.so.1 -Wl,-soname,libselinux.so.1 selinux-mock.c
# strip libselinux.so.1
# More information: https://github.com/AppImage/AppImages/issues/83
# More information: https://github.com/AppImageCommunity/pkg2appimage/issues/83
# and https://github.com/AppImage/AppImageKit/issues/775#issuecomment-614954821
# https://gitlab.com/sulinos/devel/libselinux-dummy

Expand All @@ -171,7 +171,7 @@ libgpg-error.so.0
# libhx509.so.5 # Missing on openSUSE LEAP 42.0
libICE.so.6
# libidn.so.11 # Does not come with Solus by default
# libk5crypto.so.3 # Running AppImage built on Debian 9 or Ubuntu 16.04 on an Archlinux fails otherwise; https://github.com/AppImage/AppImages/issues/301
# libk5crypto.so.3 # Running AppImage built on Debian 9 or Ubuntu 16.04 on an Archlinux fails otherwise; https://github.com/AppImageCommunity/pkg2appimage/issues/301
# libkeyutils.so.1 # Does not come with Void Linux by default; https://github.com/Subsurface-divelog/subsurface/issues/1971#issuecomment-466606834
# libkrb5.so.26 # Disputed, seemingly needed by Arch Linux since Kerberos is named differently there. Missing on openSUSE LEAP 42.0
# libkrb5.so.3 # Disputed, seemingly needed by Arch Linux since Kerberos is named differently there
Expand Down Expand Up @@ -210,11 +210,11 @@ libpipewire-0.3.so.0
# nss_error=-5925, os_error=0
# libnss3.so should not be removed from the bundles, as this causes other issues, e.g.,
# https://github.com/probonopd/linuxdeployqt/issues/35#issuecomment-256213517
# and https://github.com/AppImage/AppImages/pull/114
# and https://github.com/AppImageCommunity/pkg2appimage/pull/114
# libnss3.so

# The following cannot be excluded, see
# https://github.com/AppImage/AppImages/commit/6c7473d8cdaaa2572248dcc53d7f617a577ade6b
# https://github.com/AppImageCommunity/pkg2appimage/commit/6c7473d8cdaaa2572248dcc53d7f617a577ade6b
# http://stackoverflow.com/questions/32644157/forcing-a-binary-to-use-a-specific-newer-version-of-a-shared-library-so
# libssl.so.1
# libssl.so.1.0.0
Expand All @@ -228,7 +228,7 @@ libpipewire-0.3.so.0

# libglut.so.3 # to be confirmed

libxcb-dri3.so.0 # https://github.com/AppImage/AppImages/issues/348
libxcb-dri3.so.0 # https://github.com/AppImageCommunity/pkg2appimage/issues/348
libxcb-dri2.so.0 # https://github.com/probonopd/linuxdeployqt/issues/331#issuecomment-442276277

# If the next line turns out to cause issues, we will have to remove it again and find another solution
Expand Down
2 changes: 1 addition & 1 deletion excludesuselist
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Automatically generated by running on openSUSE 13.1:
# wget https://github.com/AppImage/AppImages/raw/master/excludelist
# wget https://github.com/AppImageCommunity/pkg2appimage/raw/master/excludelist
# FILES=$(cat excludelist | sed '/^\s*$/d' | sed '/^#.*$/d')
# for FILE in $FILES; do zypper search -f "$FILE" | grep "| package" | head -n 1 | cut -d "|" -f 2 | cut -d " " -f 2 >> packages; done
# cat packages | sort | uniq
Expand Down
46 changes: 3 additions & 43 deletions functions.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# This file is supposed to be sourced by each Recipe
# that wants to use the functions contained herein
# like so:
# wget -q https://github.com/AppImage/AppImages/raw/${PKG2AICOMMIT}/functions.sh -O ./functions.sh
# wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/${PKG2AICOMMIT}/functions.sh -O ./functions.sh
# . ./functions.sh

# RECIPE=$(realpath "$0")
Expand Down Expand Up @@ -161,46 +161,6 @@ get_desktopintegration()
# sed -i -e "s|^Exec=$REALBIN|Exec=$REALBIN.wrapper|g" $1.desktop
}

# Generate AppImage; this expects $ARCH, $APP and $VERSION to be set
generate_appimage()
{
# Download AppImageAssistant
URL="https://github.com/AppImage/AppImageKit/releases/download/6/AppImageAssistant_6-${SYSTEM_ARCH}.AppImage"
wget -c "$URL" -O AppImageAssistant
chmod a+x ./AppImageAssistant

# if [[ "$RECIPE" == *ecipe ]] ; then
# echo "#!/bin/bash -ex" > ./$APP.AppDir/Recipe
# echo "# This recipe was used to generate this AppImage." >> ./$APP.AppDir/Recipe
# echo "# See http://appimage.org for more information." >> ./$APP.AppDir/Recipe
# echo "" >> ./$APP.AppDir/Recipe
# cat $RECIPE >> ./$APP.AppDir/Recipe
# fi
#
# Detect the architecture of what we are packaging.
# The main binary could be a script, so let's use a .so library
BIN=$(find . -name *.so* -type f | head -n 1)
INFO=$(file "$BIN")
if [ -z $ARCH ] ; then
if [[ $INFO == *"x86-64"* ]] ; then
ARCH=x86_64
elif [[ $INFO == *"i686"* ]] ; then
ARCH=i686
elif [[ $INFO == *"armv6l"* ]] ; then
ARCH=armhf
else
echo "Could not automatically detect the architecture."
echo "Please set the \$ARCH environment variable."
exit 1
fi
fi

mkdir -p ../out || true
rm ../out/$APP"-"$VERSION".glibc"$GLIBC_NEEDED"-"$ARCH".AppImage" 2>/dev/null || true
GLIBC_NEEDED=$(glibc_needed)
./AppImageAssistant ./$APP.AppDir/ ../out/$APP"-"$VERSION".glibc"$GLIBC_NEEDED"-"$ARCH".AppImage"
}

# Generate AppImage type 2
# Additional parameters given to this routine will be passed on to appimagetool
#
Expand All @@ -217,7 +177,7 @@ generate_type2_appimage()
# URL=$(wget -q "https://s3.amazonaws.com/archive.travis-ci.org/jobs/$((ID+2))/log.txt" -O - | grep "https://transfer.sh/.*/appimagetool" | tail -n 1 | sed -e 's|\r||g')
# fi
if [ -z "$(which appimagetool)" ] ; then
URL="https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-${SYSTEM_ARCH}.AppImage"
URL="https://github.com/AppImage/appimagetool/releases/download/continuous/appimagetool-${SYSTEM_ARCH}.AppImage"
wget -c "$URL" -O appimagetool
chmod a+x ./appimagetool
appimagetool=$(readlink -f appimagetool)
Expand Down Expand Up @@ -284,7 +244,7 @@ generate_status()
if [ -e "${HERE}/usr/share/pkg2appimage/excludedeblist" ] ; then
EXCLUDEDEBLIST="${HERE}/usr/share/pkg2appimage/excludedeblist"
else
wget -q -c "https://github.com/AppImage/AppImages/raw/${PKG2AICOMMIT}/excludedeblist"
wget -q -c "https://github.com/AppImageCommunity/pkg2appimage/raw/${PKG2AICOMMIT}/excludedeblist"
EXCLUDEDEBLIST=excludedeblist
fi
rm status 2>/dev/null || true
Expand Down
2 changes: 1 addition & 1 deletion legacy/arduino/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ APP=Arduino
mkdir -p ./$APP
cd ./$APP

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

wget -c "$URL"
Expand Down
2 changes: 1 addition & 1 deletion legacy/aseprite/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mkdir -p ./$APP/$APP.AppDir/usr/lib

cd ./$APP/

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

# We get this app and almost all its dependencies via apt-get
Expand Down
2 changes: 1 addition & 1 deletion legacy/atom/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ APP=Atom
mkdir -p ./$APP/$APP.AppDir/usr/bin
cd ./$APP

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

wget -c --trust-server-names "$URL"
Expand Down
2 changes: 1 addition & 1 deletion legacy/audacity/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mkdir -p $APP/$APP.AppDir

cd $APP

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

cd $APP.AppDir
Expand Down
2 changes: 1 addition & 1 deletion legacy/blender/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ APP=Blender
mkdir -p ./$APP/$APP.AppDir/usr/bin
cd ./$APP

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

wget -c "$URL"
Expand Down
2 changes: 1 addition & 1 deletion legacy/bluegriffon/Recipe.precompiled
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ mkdir -p ./$APP/$APP.AppDir/usr

cd ./$APP

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

VERSION=$(wget -c "http://bluegriffon.org/freshmeat/?C=M;O=D" -O - | grep href | head -n 2 | tail -n 1 | cut -d '"' -f 2 | cut -d / -f 1)
Expand Down
2 changes: 1 addition & 1 deletion legacy/brackets/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ mkdir -p ./$APP/$APP.AppDir/usr/lib

cd ./$APP/

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

# We get this app and almost all its dependencies via apt-get
Expand Down
2 changes: 1 addition & 1 deletion legacy/chromium/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ set +e
mkdir -p chromium/chromium.AppDir
cd chromium/

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

wget -c --trust-server-names "https://download-chromium.appspot.com/dl/Linux_x64?type=snapshots"
Expand Down
2 changes: 1 addition & 1 deletion legacy/clementine/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@ apt-get $OPTIONS update

URLS=$(apt-get $OPTIONS -y install --print-uris $LOWERAPP | cut -d "'" -f 2 | grep -e "^http")

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

wget -c $URLS
Expand Down
2 changes: 1 addition & 1 deletion legacy/corebird/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ mkdir -p ./$APP/$APP.AppDir/usr/lib

cd ./$APP/

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

generate_status
Expand Down
2 changes: 1 addition & 1 deletion legacy/cura/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ cd $APP/
# Source some helper functions
########################################################################

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

########################################################################
Expand Down
2 changes: 1 addition & 1 deletion legacy/darktable/Recipe
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

APP=Darktable
Expand Down
2 changes: 1 addition & 1 deletion legacy/demonsaw/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ mkdir -p ./$APP/$APP.AppDir/usr/lib

cd ./$APP/

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

# We get this app and almost all its dependencies via apt-get
Expand Down
4 changes: 2 additions & 2 deletions legacy/digikam/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ mkdir -p ./$APP/$APP.AppDir/usr/lib

cd ./$APP/

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

# We get this app and almost all its dependencies via apt-get
Expand All @@ -24,7 +24,7 @@ apt-get $OPTIONS update

URLS=$(apt-get $OPTIONS -y install --print-uris $LOWERAPP | cut -d "'" -f 2 | grep -e "^http")

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

wget -c $URLS
Expand Down
2 changes: 1 addition & 1 deletion legacy/docfetcher/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ APP=DocFetcher
mkdir -p ./$APP/$APP.AppDir/usr/bin
cd ./$APP

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

# Get Java
Expand Down
2 changes: 1 addition & 1 deletion legacy/eclipse/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ mkdir -p $APP/$APP.AppDir/usr/bin

cd $APP/

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

# FIXME: Never hardcode download links in this way; get from "official" URL
Expand Down
2 changes: 1 addition & 1 deletion legacy/engauge-digitizer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
FROM centos:6
ADD https://github.com/AppImage/AppImages/raw/master/recipes/engauge-digitizer/Recipe /Recipe
ADD https://github.com/AppImageCommunity/pkg2appimage/raw/master/recipes/engauge-digitizer/Recipe /Recipe
RUN sed -i -e 's|sudo ||g' Recipe && bash -ex Recipe && yum clean all && rm -rf /Engauge-Digitizer/Engauge-Digitizer* && rm -rf /out
2 changes: 1 addition & 1 deletion legacy/engauge-digitizer/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ fi

if [ -z "$NO_DOWNLOAD" ] ; then

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

APP=Engauge-Digitizer
Expand Down
2 changes: 1 addition & 1 deletion legacy/etcher/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ APP=Etcher
mkdir -p $APP/$APP.AppDir
cd $APP/

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

# Get the current version from the GitHub Releases page
Expand Down
4 changes: 2 additions & 2 deletions legacy/fbreader/Recipe
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ mkdir -p ./$APP/$APP.AppDir/usr/lib

cd ./$APP/

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

# We get this app and almost all its dependencies via apt-get
Expand Down Expand Up @@ -133,7 +133,7 @@ apt-get $OPTIONS update

URLS=$(apt-get $OPTIONS -y install --print-uris libbz2-1.0 libexpat1 libfribidi0 libqt4-network libqtcore4 libqtgui4 libsqlite3-0 zlib1g | cut -d "'" -f 2 | grep -e "^http")

wget -q https://github.com/AppImage/AppImages/raw/master/functions.sh -O ./functions.sh
wget -q https://github.com/AppImageCommunity/pkg2appimage/raw/master/functions.sh -O ./functions.sh
. ./functions.sh

wget -c $URLS
Expand Down
Loading