From 4c4f429c05cbdb59edc6221a3e83e2cbe9922682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Sun, 17 Dec 2017 21:20:57 +0800
Subject: [PATCH 01/29] update to 4.x

---
 recipes/qBittorrent.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/qBittorrent.yml b/recipes/qBittorrent.yml
index 6e2359a1..bdd9b6e8 100644
--- a/recipes/qBittorrent.yml
+++ b/recipes/qBittorrent.yml
@@ -2,8 +2,8 @@ app: qBittorrent
 
 ingredients:
   package: qbittorrent
-  dist:    trusty
+  dist:    xenial
   sources:
-    - deb http://us.archive.ubuntu.com/ubuntu/ trusty main universe
+    - deb http://cn.archive.ubuntu.com/ubuntu/ xenial main universe
   ppas:
     - qbittorrent-team/qbittorrent-stable

From 7f9af397a25ab128c9882572f334ccd8af8d4d3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Sun, 17 Dec 2017 21:34:19 +0800
Subject: [PATCH 02/29] Update qBittorrent.yml

---
 recipes/qBittorrent.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/qBittorrent.yml b/recipes/qBittorrent.yml
index bdd9b6e8..67a5321d 100644
--- a/recipes/qBittorrent.yml
+++ b/recipes/qBittorrent.yml
@@ -6,4 +6,4 @@ ingredients:
   sources:
     - deb http://cn.archive.ubuntu.com/ubuntu/ xenial main universe
   ppas:
-    - qbittorrent-team/qbittorrent-stable
+    - qbittorrent-team/qbittorrent-unstable

From 17d1de7dfbca3eb8dc8cdb4e27a9c710048a520b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Mon, 18 Dec 2017 22:17:58 +0800
Subject: [PATCH 03/29] Update pkg2appimage

---
 pkg2appimage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg2appimage b/pkg2appimage
index 7458c891..22f5c5af 100755
--- a/pkg2appimage
+++ b/pkg2appimage
@@ -38,7 +38,7 @@ which cut >/dev/null 2>&1 || ( echo cut missing && exit 1 )
 if [ ! -f "${!#}" ] ; then
   YAMLFILE=/tmp/_recipe.yml
   rm -f "$YAMLFILE"
-  wget -q "https://github.com/AppImage/AppImages/raw/master/recipes/${!#}.yml" -O "$YAMLFILE"
+  wget -q "https://github.com/Gamuxorg/AppImages/raw/master/recipes/${!#}.yml" -O "$YAMLFILE"
 else
   YAMLFILE=$(readlink -f "${!#}")
 fi

From d976f882336cde048bc62c00f8c4f881dfcac8a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Mon, 18 Dec 2017 22:19:46 +0800
Subject: [PATCH 04/29] Update qBittorrent.yml

---
 recipes/qBittorrent.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/qBittorrent.yml b/recipes/qBittorrent.yml
index 67a5321d..bdd9b6e8 100644
--- a/recipes/qBittorrent.yml
+++ b/recipes/qBittorrent.yml
@@ -6,4 +6,4 @@ ingredients:
   sources:
     - deb http://cn.archive.ubuntu.com/ubuntu/ xenial main universe
   ppas:
-    - qbittorrent-team/qbittorrent-unstable
+    - qbittorrent-team/qbittorrent-stable

From 8f7aae0065acf9ff5007c312a58d2fc181157b7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Tue, 19 Dec 2017 22:28:01 +0800
Subject: [PATCH 05/29] Update 0ad.yml

---
 recipes/0ad.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index 99f14320..8d446889 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -3,7 +3,7 @@ app: 0ad
 ingredients:
   dist: trusty
   sources:
-    - deb http://ftp.fau.de/ubuntu/ trusty main universe
+    - deb https://mirrors.aliyun.com/ubuntu/ trusty main universe
   ppas:
     - wfg/0ad
 

From 89d65cd508af2b2312c6d78a4333c51a139b0679 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Tue, 19 Dec 2017 22:52:56 +0800
Subject: [PATCH 06/29] Update pkg2appimage

update launchpad.net to the proxy website  launchpad.proxy.ustclug.org
---
 pkg2appimage | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkg2appimage b/pkg2appimage
index 22f5c5af..06d991c3 100755
--- a/pkg2appimage
+++ b/pkg2appimage
@@ -187,15 +187,15 @@ if [ ! -z "${_ingredients_dist}" ] ; then
     echo "${SOURCE}" >> sources.list
   done
   for PPA in "${_ingredients_ppas[@]}" ; do
-    echo "deb http://ppa.launchpad.net/${PPA}/ubuntu ${_ingredients_dist} main" >> sources.list
+    echo "deb http://launchpad.proxy.ustclug.org/${PPA}/ubuntu ${_ingredients_dist} main" >> sources.list
   done
   # Use libcurl-slim to reduce AppImage size, thanks darealshinji
   # Not really compiled on xenial but CentOS 6, https://github.com/AppImage/AppImages/issues/187
-  echo "deb http://ppa.launchpad.net/djcj/libcurl-slim/ubuntu xenial main" >> sources.list
+  echo "deb http://launchpad.proxy.ustclug.org/djcj/libcurl-slim/ubuntu xenial main" >> sources.list
   # Use gnutls-patched to have libgnutls look in various distributions' places for certificates,
   # https://github.com/darealshinji/vlc-AppImage/issues/1#issuecomment-321041496
   # echo "deb http://ppa.launchpad.net/djcj/gnutls-patched/ubuntu ${_ingredients_dist} main" >> sources.list
-  echo "deb http://ppa.launchpad.net/djcj/gnutls-patched/ubuntu trusty main" >> sources.list
+  echo "deb http://launchpad.proxy.ustclug.org/djcj/gnutls-patched/ubuntu trusty main" >> sources.list
 fi
 
 if [ ! -z "${_ingredients_script[0]}" ] ; then

From 2fe874878433e9e7fb45f9cab77b7800ee4a0f91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Wed, 20 Dec 2017 00:05:07 +0800
Subject: [PATCH 07/29] Update pkg2appimage

---
 pkg2appimage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg2appimage b/pkg2appimage
index 06d991c3..d4af8f0b 100755
--- a/pkg2appimage
+++ b/pkg2appimage
@@ -195,7 +195,7 @@ if [ ! -z "${_ingredients_dist}" ] ; then
   # Use gnutls-patched to have libgnutls look in various distributions' places for certificates,
   # https://github.com/darealshinji/vlc-AppImage/issues/1#issuecomment-321041496
   # echo "deb http://ppa.launchpad.net/djcj/gnutls-patched/ubuntu ${_ingredients_dist} main" >> sources.list
-  echo "deb http://launchpad.proxy.ustclug.org/djcj/gnutls-patched/ubuntu trusty main" >> sources.list
+  echo "deb http://download.opensuse.org/repositories/home:/TheAssassin:/AppImageLibraries/xUbuntu_14.04/ /" >> sources.list
 fi
 
 if [ ! -z "${_ingredients_script[0]}" ] ; then

From 7ceb3fd9fc8dddf53bf2c0929244c5f8fa0a3438 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Thu, 21 Dec 2017 21:54:24 +0800
Subject: [PATCH 08/29] Update 0ad.yml

---
 recipes/0ad.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index 8d446889..a2830153 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -11,3 +11,6 @@ ingredients:
 script:
   - find usr/lib/games/0ad/ -type f -iname '*.so.*' -exec mv {} usr/lib/ \;
   - mv usr/games/* usr/bin/
+  - mkdir -p usr/bin/share
+  - mv usr/share/* usr/bin
+  - sed -i -e 's#/usr#././#g' usr/bin/pyrogenesis

From 22ca83c78bd1df1022adecec39544a86b4280dd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Thu, 21 Dec 2017 21:59:24 +0800
Subject: [PATCH 09/29] Update 0ad.yml

---
 recipes/0ad.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index a2830153..0b2f4199 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -12,5 +12,5 @@ script:
   - find usr/lib/games/0ad/ -type f -iname '*.so.*' -exec mv {} usr/lib/ \;
   - mv usr/games/* usr/bin/
   - mkdir -p usr/bin/share
-  - mv usr/share/* usr/bin
+  - mv usr/share/* usr/bin/share
   - sed -i -e 's#/usr#././#g' usr/bin/pyrogenesis

From eea2fc697c96d160151319b308a46d393653a003 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Thu, 21 Dec 2017 22:06:35 +0800
Subject: [PATCH 10/29] Update 0ad.yml

---
 recipes/0ad.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index 0b2f4199..3f3829c7 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -12,5 +12,5 @@ script:
   - find usr/lib/games/0ad/ -type f -iname '*.so.*' -exec mv {} usr/lib/ \;
   - mv usr/games/* usr/bin/
   - mkdir -p usr/bin/share
-  - mv usr/share/* usr/bin/share
+  - mv usr/share/games usr/bin/share
   - sed -i -e 's#/usr#././#g' usr/bin/pyrogenesis

From bd82775f91b1013e0da52dcd827ae7e1435ea599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Thu, 21 Dec 2017 22:35:47 +0800
Subject: [PATCH 11/29] Update 0ad.yml

---
 recipes/0ad.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index 3f3829c7..f8179327 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -14,3 +14,4 @@ script:
   - mkdir -p usr/bin/share
   - mv usr/share/games usr/bin/share
   - sed -i -e 's#/usr#././#g' usr/bin/pyrogenesis
+  - sed -i "1a HERE=\$\(cd \"\$\(dirname \"\$0\"\)\";pwd\)\ncd \"\$HERE\""

From f97b5bcb741dfbb141489075498ad3df93412af2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Thu, 21 Dec 2017 22:36:57 +0800
Subject: [PATCH 12/29] Update 0ad.yml

---
 recipes/0ad.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index f8179327..3f3829c7 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -14,4 +14,3 @@ script:
   - mkdir -p usr/bin/share
   - mv usr/share/games usr/bin/share
   - sed -i -e 's#/usr#././#g' usr/bin/pyrogenesis
-  - sed -i "1a HERE=\$\(cd \"\$\(dirname \"\$0\"\)\";pwd\)\ncd \"\$HERE\""

From 9330fcd99e5a0cc36f49c5731802f9fabe14f981 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Thu, 21 Dec 2017 23:18:14 +0800
Subject: [PATCH 13/29] Update 0ad.yml

---
 recipes/0ad.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index 3f3829c7..79e26391 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -14,3 +14,4 @@ script:
   - mkdir -p usr/bin/share
   - mv usr/share/games usr/bin/share
   - sed -i -e 's#/usr#././#g' usr/bin/pyrogenesis
+  - sed -i "1a HERE=\$(cd \"\$(dirname \"\$0\")\";pwd)\ncd \"\$HERE\"" usr/bin/0ad

From dc896f06364d8fd07c01bbdc7121980f36afd374 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Thu, 21 Dec 2017 23:34:41 +0800
Subject: [PATCH 14/29] Update 0ad.yml

---
 recipes/0ad.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index 79e26391..a254b7ee 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -14,4 +14,4 @@ script:
   - mkdir -p usr/bin/share
   - mv usr/share/games usr/bin/share
   - sed -i -e 's#/usr#././#g' usr/bin/pyrogenesis
-  - sed -i "1a HERE=\$(cd \"\$(dirname \"\$0\")\";pwd)\ncd \"\$HERE\"" usr/bin/0ad
+  - sed -i "1a HERE='$'(cd '"''$'(dirname '"''$'0'"')'"';pwd) && cd '"''$'HERE'"'" usr/bin/0ad

From b2c8c73a3812a379e8bfa8c98586ce2b21b4bc96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Thu, 21 Dec 2017 23:37:34 +0800
Subject: [PATCH 15/29] Update 0ad.yml

---
 recipes/0ad.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index a254b7ee..4d13bd46 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -14,4 +14,4 @@ script:
   - mkdir -p usr/bin/share
   - mv usr/share/games usr/bin/share
   - sed -i -e 's#/usr#././#g' usr/bin/pyrogenesis
-  - sed -i "1a HERE='$'(cd '"''$'(dirname '"''$'0'"')'"';pwd) && cd '"''$'HERE'"'" usr/bin/0ad
+  - sed -i sed -i "1a HERE=$(cd "$(dirname "$0")";pwd) && cd "$HERE"" usr/bin/0ad

From df6de5be8c97bf8448a56407288d295b72adb1c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Thu, 21 Dec 2017 23:40:14 +0800
Subject: [PATCH 16/29] Update 0ad.yml

---
 recipes/0ad.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index 4d13bd46..79e26391 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -14,4 +14,4 @@ script:
   - mkdir -p usr/bin/share
   - mv usr/share/games usr/bin/share
   - sed -i -e 's#/usr#././#g' usr/bin/pyrogenesis
-  - sed -i sed -i "1a HERE=$(cd "$(dirname "$0")";pwd) && cd "$HERE"" usr/bin/0ad
+  - sed -i "1a HERE=\$(cd \"\$(dirname \"\$0\")\";pwd)\ncd \"\$HERE\"" usr/bin/0ad

From b9dd3e72353b1926cb348af4ce16c4c58f572eaf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Fri, 22 Dec 2017 00:14:52 +0800
Subject: [PATCH 17/29] Update 0ad.yml

---
 recipes/0ad.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index 79e26391..3f3829c7 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -14,4 +14,3 @@ script:
   - mkdir -p usr/bin/share
   - mv usr/share/games usr/bin/share
   - sed -i -e 's#/usr#././#g' usr/bin/pyrogenesis
-  - sed -i "1a HERE=\$(cd \"\$(dirname \"\$0\")\";pwd)\ncd \"\$HERE\"" usr/bin/0ad

From deab1af9d9adfd00bf9f10613b561c8d337d87df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Fri, 22 Dec 2017 00:25:12 +0800
Subject: [PATCH 18/29] Update 0ad.yml

---
 recipes/0ad.yml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index 3f3829c7..23a56a90 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -14,3 +14,17 @@ script:
   - mkdir -p usr/bin/share
   - mv usr/share/games usr/bin/share
   - sed -i -e 's#/usr#././#g' usr/bin/pyrogenesis
+  - rm usr/bin/0ad
+  - cat > usr/bin/0ad <<EOF
+  - #!/bin/sh
+  - HERE=\$(cd "\$(dirname "\$0")";pwd)
+  - cd "$HERE"
+  - pyrogenesis=\$(which pyrogenesis 2> /dev/null)
+  - if [ -x "\$pyrogenesis" ] ; then
+  -  "\$pyrogenesis" "\$@"
+  - else
+  -  echo "Error: pyrogenesis not found in (\$PATH)"
+  -  exit 1
+  - fi
+  - EOF
+  - chmod +x 0ad

From 64e198e8f71f250fc3cdf9b65562ce39acba22de Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Fri, 22 Dec 2017 00:28:20 +0800
Subject: [PATCH 19/29] Update 0ad.yml

---
 recipes/0ad.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index 23a56a90..4255bf05 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -17,13 +17,13 @@ script:
   - rm usr/bin/0ad
   - cat > usr/bin/0ad <<EOF
   - #!/bin/sh
-  - HERE=\$(cd "\$(dirname "\$0")";pwd)
+  - HERE=\$(cd "$(dirname "$0")";pwd)
   - cd "$HERE"
   - pyrogenesis=\$(which pyrogenesis 2> /dev/null)
-  - if [ -x "\$pyrogenesis" ] ; then
-  -  "\$pyrogenesis" "\$@"
+  - if [ -x "$pyrogenesis" ] ; then
+  -  "$pyrogenesis" "$@"
   - else
-  -  echo "Error: pyrogenesis not found in (\$PATH)"
+  -  echo "Error: pyrogenesis not found in ($PATH)"
   -  exit 1
   - fi
   - EOF

From 933e11f7a57226b3dc4518f24ccf29959ed92243 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Fri, 22 Dec 2017 21:39:16 +0800
Subject: [PATCH 20/29] Update pkg2appimage
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

TheAssissan 先生在obs构建的gnutls-patched速度太慢，可能导致失败，换回ppa版本了
---
 pkg2appimage | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkg2appimage b/pkg2appimage
index d4af8f0b..1f5e628e 100755
--- a/pkg2appimage
+++ b/pkg2appimage
@@ -195,7 +195,7 @@ if [ ! -z "${_ingredients_dist}" ] ; then
   # Use gnutls-patched to have libgnutls look in various distributions' places for certificates,
   # https://github.com/darealshinji/vlc-AppImage/issues/1#issuecomment-321041496
   # echo "deb http://ppa.launchpad.net/djcj/gnutls-patched/ubuntu ${_ingredients_dist} main" >> sources.list
-  echo "deb http://download.opensuse.org/repositories/home:/TheAssassin:/AppImageLibraries/xUbuntu_14.04/ /" >> sources.list
+  echo "deb https://launchpad.proxy.ustclug.org/djcj/gnutls-patched/ubuntu trusty main" >> sources.list
 fi
 
 if [ ! -z "${_ingredients_script[0]}" ] ; then

From 00fa6ed7ca44797e6060f643282a8d7e6ca6c2f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Fri, 22 Dec 2017 22:26:52 +0800
Subject: [PATCH 21/29] Update 0ad.yml
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

需要打包中文mod的，可以在自动打包的时候ctrl+c取消掉，手动把中文mod放到0ad.AppDir里，然后手动打包一下
---
 recipes/0ad.yml | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index 4255bf05..2e8c36d5 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -3,7 +3,7 @@ app: 0ad
 ingredients:
   dist: trusty
   sources:
-    - deb https://mirrors.aliyun.com/ubuntu/ trusty main universe
+    - deb http://cn.archive.ubuntu.com/ubuntu/ trusty main universe
   ppas:
     - wfg/0ad
 
@@ -14,17 +14,4 @@ script:
   - mkdir -p usr/bin/share
   - mv usr/share/games usr/bin/share
   - sed -i -e 's#/usr#././#g' usr/bin/pyrogenesis
-  - rm usr/bin/0ad
-  - cat > usr/bin/0ad <<EOF
-  - #!/bin/sh
-  - HERE=\$(cd "$(dirname "$0")";pwd)
-  - cd "$HERE"
-  - pyrogenesis=\$(which pyrogenesis 2> /dev/null)
-  - if [ -x "$pyrogenesis" ] ; then
-  -  "$pyrogenesis" "$@"
-  - else
-  -  echo "Error: pyrogenesis not found in ($PATH)"
-  -  exit 1
-  - fi
-  - EOF
-  - chmod +x 0ad
+  - sed -i '1a HERE=$(cd "$(dirname "$0")";pwd) && cd $HERE' usr/bin/0ad

From eedf1d868c36e24d0d7d9d8d1da5b5a1c4505c52 Mon Sep 17 00:00:00 2001
From: xiaoji <345865759@163.com>
Date: Fri, 22 Dec 2017 22:53:22 +0800
Subject: [PATCH 22/29] fix0ad

---
 YML.md                      |  1 +
 pkg2appimage                | 13 ++++++---
 recipes/FreeCAD-asm3.yml    | 54 +++++++++++++++++++++++++++++++++++++
 recipes/FreeCAD-nightly.yml |  2 ++
 recipes/qBittorrent.yml     |  4 +--
 5 files changed, 68 insertions(+), 6 deletions(-)
 create mode 100644 recipes/FreeCAD-asm3.yml

diff --git a/YML.md b/YML.md
index 0ecfd1d5..a851ef6c 100644
--- a/YML.md
+++ b/YML.md
@@ -172,6 +172,7 @@ This downloads the payload application, JabRef, and the required JRE which requi
 
 The script could also be used to fetch pre-built Debian packages from a GitHub release page, or to override the version of a package.
 
+Use `post_script` instead of `script` if you need this to run _after_ the other ingredient processing has taken place.
 
 ### Script section
 
diff --git a/pkg2appimage b/pkg2appimage
index 1f5e628e..83e8b80e 100755
--- a/pkg2appimage
+++ b/pkg2appimage
@@ -38,7 +38,7 @@ which cut >/dev/null 2>&1 || ( echo cut missing && exit 1 )
 if [ ! -f "${!#}" ] ; then
   YAMLFILE=/tmp/_recipe.yml
   rm -f "$YAMLFILE"
-  wget -q "https://github.com/Gamuxorg/AppImages/raw/master/recipes/${!#}.yml" -O "$YAMLFILE"
+  wget -q "https://github.com/AppImage/AppImages/raw/master/recipes/${!#}.yml" -O "$YAMLFILE"
 else
   YAMLFILE=$(readlink -f "${!#}")
 fi
@@ -187,15 +187,15 @@ if [ ! -z "${_ingredients_dist}" ] ; then
     echo "${SOURCE}" >> sources.list
   done
   for PPA in "${_ingredients_ppas[@]}" ; do
-    echo "deb http://launchpad.proxy.ustclug.org/${PPA}/ubuntu ${_ingredients_dist} main" >> sources.list
+    echo "deb http://ppa.launchpad.net/${PPA}/ubuntu ${_ingredients_dist} main" >> sources.list
   done
   # Use libcurl-slim to reduce AppImage size, thanks darealshinji
   # Not really compiled on xenial but CentOS 6, https://github.com/AppImage/AppImages/issues/187
-  echo "deb http://launchpad.proxy.ustclug.org/djcj/libcurl-slim/ubuntu xenial main" >> sources.list
+  echo "deb http://ppa.launchpad.net/djcj/libcurl-slim/ubuntu xenial main" >> sources.list
   # Use gnutls-patched to have libgnutls look in various distributions' places for certificates,
   # https://github.com/darealshinji/vlc-AppImage/issues/1#issuecomment-321041496
   # echo "deb http://ppa.launchpad.net/djcj/gnutls-patched/ubuntu ${_ingredients_dist} main" >> sources.list
-  echo "deb https://launchpad.proxy.ustclug.org/djcj/gnutls-patched/ubuntu trusty main" >> sources.list
+  echo "deb http://ppa.launchpad.net/djcj/gnutls-patched/ubuntu trusty main" >> sources.list
 fi
 
 if [ ! -z "${_ingredients_script[0]}" ] ; then
@@ -242,6 +242,11 @@ if [ ! -z "${_ingredients_dist}" ] ; then
   $dltool -c -i- <<<"$URLS"
 fi
 
+if [ ! -z "${_ingredients_post_script[0]}" ] ; then
+  # Execute extra steps defined in recipe
+  shell_execute $YAMLFILE _ingredients_post_script
+fi
+
 mkdir -p ./$APP.AppDir/
 cd ./$APP.AppDir/
 
diff --git a/recipes/FreeCAD-asm3.yml b/recipes/FreeCAD-asm3.yml
new file mode 100644
index 00000000..54211e9b
--- /dev/null
+++ b/recipes/FreeCAD-asm3.yml
@@ -0,0 +1,54 @@
+app: FreeCAD-asm3
+binpatch: true
+
+ingredients:
+  dist: trusty
+  sources: 
+    - deb http://archive.ubuntu.com/ubuntu/ trusty main universe
+  ppas:
+    - freecad-maintainers/freecad-daily
+  packages:
+    - freecad-daily
+    # - calculix-ccx
+    - appmenu-qt
+  pretend:
+    - libfontconfig1 2.11.0-0ubuntu4
+  script:
+    - rm -f freecad-daily*amd64.deb
+    # try to restore the original package to prevent repeated download
+    - ! test -f tmp/freecad-daily*.deb || mv tmp/freecad-daily*.deb .
+  post_script:
+    - mkdir -p tmp
+    # save the original package for future redo
+    - mv freecad-daily*.deb tmp/
+    # replace the freecad deb package with our custom build
+    - cp $HOME/pbuilder/trusty_result/freecad-daily*amd64.deb .
+
+script:
+  # install asm3
+  - dir=$PWD
+  - cd ./usr/lib/freecad-daily/Ext/freecad
+  - rm -rf asm3
+  - git clone https://github.com/realthunder/FreeCAD_assembly3.git asm3 
+  - cd asm3
+  - git submodule update --init py_slvs
+  # generate version as asm3-<asm3 last commit hash>-<last commit date>
+  - gitdate=`date -d "$(git show -s --format=%aI)" +%Y%m%d%H%M`
+  - debdate=`date -r $dir/../freecad-daily*.deb +%Y%m%d%H%M`
+  - [ $debdate -lt $gitdate ] || gitdate=$debdate
+  - echo "asm3-$(git show -s --format=%h)-$gitdate" > $dir/../VERSION
+  - rm -rf `find -name '.git*'`
+  - cd $dir
+  # resume setup just like FreeCAD-nightly
+  - cp ./usr/share/applications/freecad-daily.desktop .
+  - ln -s freecad-daily.desktop freecad-asm3.desktop
+  - sed -i -e 's@FreeCAD Daily@FreeCAD@g' freecad-daily.desktop
+  - sed -i -e 's@/usr/bin/@@g' freecad-daily.desktop
+  - sed -i -e 's@Path=@# Path=@g' freecad-daily.desktop
+  # - sed -i -e 's@Icon=freecad@Icon=freecad-daily@g' freecad-daily.desktop
+  - cp ./usr/share/icons/hicolor/64x64/apps/freecad-daily.png .
+  - # Dear upstream developers, please use relative rather than absolute paths
+  - # then binary patching like this will become unneccessary
+  - find usr/ -type f -exec sed -i -e "s@/usr/lib/freecad-daily@././/lib/freecad-daily@g" {} \;
+  - find usr/ -type f -exec sed -i -e "s@/usr/share/freecad-daily@././/share/freecad-daily@g" {} \;
+  - ( cd ./usr/lib/freecad-daily/ ; ln -s ../../share/ . ) # Why?
diff --git a/recipes/FreeCAD-nightly.yml b/recipes/FreeCAD-nightly.yml
index 924bf535..ff687ba0 100644
--- a/recipes/FreeCAD-nightly.yml
+++ b/recipes/FreeCAD-nightly.yml
@@ -23,6 +23,8 @@ script:
   - sed -i -e 's@Path=@# Path=@g' freecad-daily.desktop
   # - sed -i -e 's@Icon=freecad@Icon=freecad-daily@g' freecad-daily.desktop
   - cp ./usr/share/icons/hicolor/64x64/apps/freecad-daily.png .
+  - mv ./usr/lib/lapack/*.so* ./usr/lib/
+  - mv ./usr/lib/libblas/*.so* ./usr/lib/
   - # Dear upstream developers, please use relative rather than absolute paths
   - # then binary patching like this will become unneccessary
   - find usr/ -type f -exec sed -i -e "s@/usr/lib/freecad-daily@././/lib/freecad-daily@g" {} \;
diff --git a/recipes/qBittorrent.yml b/recipes/qBittorrent.yml
index bdd9b6e8..6e2359a1 100644
--- a/recipes/qBittorrent.yml
+++ b/recipes/qBittorrent.yml
@@ -2,8 +2,8 @@ app: qBittorrent
 
 ingredients:
   package: qbittorrent
-  dist:    xenial
+  dist:    trusty
   sources:
-    - deb http://cn.archive.ubuntu.com/ubuntu/ xenial main universe
+    - deb http://us.archive.ubuntu.com/ubuntu/ trusty main universe
   ppas:
     - qbittorrent-team/qbittorrent-stable

From 03da4381fc57a4cbc31c8992560363fe52b8227d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Sat, 23 Dec 2017 00:47:28 +0800
Subject: [PATCH 23/29] Update 0ad.yml

---
 recipes/0ad.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/recipes/0ad.yml b/recipes/0ad.yml
index 2e8c36d5..c1feacec 100644
--- a/recipes/0ad.yml
+++ b/recipes/0ad.yml
@@ -15,3 +15,4 @@ script:
   - mv usr/share/games usr/bin/share
   - sed -i -e 's#/usr#././#g' usr/bin/pyrogenesis
   - sed -i '1a HERE=$(cd "$(dirname "$0")";pwd) && cd $HERE' usr/bin/0ad
+  - ln -s usr/lib/x86_64-linux-gnu/libmozjs-38.so.0.0.0 usr/lib/x86_64-linux-gnu/libjs.so.0

From 113f081370d30af9a493edf5451b0922abd33cbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Sun, 24 Dec 2017 04:03:37 +0800
Subject: [PATCH 24/29] add OpenTTD

---
 recipes/OpenTTD | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 recipes/OpenTTD

diff --git a/recipes/OpenTTD b/recipes/OpenTTD
new file mode 100644
index 00000000..bd3ea20e
--- /dev/null
+++ b/recipes/OpenTTD
@@ -0,0 +1,37 @@
+app: openttd
+
+ingredients:      
+  script:
+    - #如果openttd及插件版本更新，请修改下面的版本号
+    - DLD='http://binaries.openttd.org/releases/1.7.1/openttd-1.7.1-linux-generic-amd64.tar.gz'
+    - wget -c $DLD
+    - wget -c 'http://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip'
+    - wget -c 'http://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-0.2.3-all.zip'
+    - wget -c 'http://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-0.3.1-all.zip'
+    - echo $DLD | cut -d '-' -f2 > VERSION
+    - tar -zxvf openttd*tar.gz
+    - find . -name '*.zip' -exec unzip {} \;
+    - find -maxdepth 1 -name "*.tar" | xargs -i tar xvf {} ;
+    - find -maxdepth 2 -name "*.txt" -exec rm {} \;
+    
+
+script:
+  - cp -r ../openttd-*/* usr/bin/
+  - cp -r ../opengfx-*/* ../opensfx-*/* ../openmsx-*/* usr/bin/baseset/
+  - find . -name openttd.128.png -exec cp {} openttd.png \;
+  - cat > usr/bin/OpenTTD <<"EOF"
+  - #!/bin/bash
+  - HERE=$(cd "$(dirname "$0")";pwd)
+  - cd "$HERE"
+  - "$HERE/openttd" "$@"
+  - EOF
+  - chmod +x usr/bin/OpenTTD
+  - cat > openttd.desktop <<EOF
+  - [Desktop Entry]
+  - Type=Application
+  - Name=OpenTTD
+  - Icon=openttd
+  - Exec=OpenTTD
+  - Categories=Game;
+  - Comment=石油大亨开源复刻版
+  - EOF

From fb21dc90e2b7de2df87fccb098b3e59460109661 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Sun, 24 Dec 2017 04:08:14 +0800
Subject: [PATCH 25/29] Delete OpenTTD

---
 recipes/OpenTTD | 37 -------------------------------------
 1 file changed, 37 deletions(-)
 delete mode 100644 recipes/OpenTTD

diff --git a/recipes/OpenTTD b/recipes/OpenTTD
deleted file mode 100644
index bd3ea20e..00000000
--- a/recipes/OpenTTD
+++ /dev/null
@@ -1,37 +0,0 @@
-app: openttd
-
-ingredients:      
-  script:
-    - #如果openttd及插件版本更新，请修改下面的版本号
-    - DLD='http://binaries.openttd.org/releases/1.7.1/openttd-1.7.1-linux-generic-amd64.tar.gz'
-    - wget -c $DLD
-    - wget -c 'http://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip'
-    - wget -c 'http://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-0.2.3-all.zip'
-    - wget -c 'http://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-0.3.1-all.zip'
-    - echo $DLD | cut -d '-' -f2 > VERSION
-    - tar -zxvf openttd*tar.gz
-    - find . -name '*.zip' -exec unzip {} \;
-    - find -maxdepth 1 -name "*.tar" | xargs -i tar xvf {} ;
-    - find -maxdepth 2 -name "*.txt" -exec rm {} \;
-    
-
-script:
-  - cp -r ../openttd-*/* usr/bin/
-  - cp -r ../opengfx-*/* ../opensfx-*/* ../openmsx-*/* usr/bin/baseset/
-  - find . -name openttd.128.png -exec cp {} openttd.png \;
-  - cat > usr/bin/OpenTTD <<"EOF"
-  - #!/bin/bash
-  - HERE=$(cd "$(dirname "$0")";pwd)
-  - cd "$HERE"
-  - "$HERE/openttd" "$@"
-  - EOF
-  - chmod +x usr/bin/OpenTTD
-  - cat > openttd.desktop <<EOF
-  - [Desktop Entry]
-  - Type=Application
-  - Name=OpenTTD
-  - Icon=openttd
-  - Exec=OpenTTD
-  - Categories=Game;
-  - Comment=石油大亨开源复刻版
-  - EOF

From 7a4b102e96894dae84017b1a499e587e4b0608f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Sun, 24 Dec 2017 04:27:23 +0800
Subject: [PATCH 26/29] Create OpenTTD.yml

---
 recipes/OpenTTD.yml | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)
 create mode 100644 recipes/OpenTTD.yml

diff --git a/recipes/OpenTTD.yml b/recipes/OpenTTD.yml
new file mode 100644
index 00000000..4ba2dbd1
--- /dev/null
+++ b/recipes/OpenTTD.yml
@@ -0,0 +1,38 @@
+app: openttd
+
+ingredients:      
+  script:
+    - #please modify the version of openttd if it will be update by up-stream!
+    - DLD='http://binaries.openttd.org/releases/1.7.1/openttd-1.7.1-linux-generic-amd64.tar.gz'
+    - wget -c $DLD
+    - wget -c 'http://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip'
+    - wget -c 'http://binaries.openttd.org/extra/opensfx/0.2.3/opensfx-0.2.3-all.zip'
+    - wget -c 'http://binaries.openttd.org/extra/openmsx/0.3.1/openmsx-0.3.1-all.zip'
+    - echo $DLD | cut -d '-' -f2 > VERSION
+    - tar -zxvf openttd*tar.gz
+    - find . -name '*.zip' -exec unzip {} \;
+    - find -maxdepth 1 -name "*.tar" | xargs -i tar xvf {} ;
+    - find -maxdepth 2 -name "*.txt" -exec rm {} \;
+    
+
+script:
+  - cp -r ../openttd-*/* usr/bin/
+  - cp -r ../opengfx-*/* ../opensfx-*/* ../openmsx-*/* usr/bin/baseset/
+  - find . -name openttd.128.png -exec cp {} openttd.png \;
+  - cat > usr/bin/OpenTTD <<"EOF"
+  - #!/bin/bash
+  - HERE=$(cd "$(dirname "$0")";pwd)
+  - cd "$HERE"
+  - "$HERE/openttd" "$@"
+  - EOF
+  - chmod +x usr/bin/OpenTTD
+  - cat > openttd.desktop <<EOF
+  - [Desktop Entry]
+  - Type=Application
+  - Name=OpenTTD
+  - Icon=openttd
+  - Exec=OpenTTD
+  - Categories=Game;
+  - Comment=an open source fork for game "Transport Tycoon Deluxe".
+  - EOF
+  

From 21e96257a78dc57ceff65179fb1a50cf355cb3f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Sun, 24 Dec 2017 04:28:52 +0800
Subject: [PATCH 27/29] Update OpenTTD.yml

---
 recipes/OpenTTD.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/recipes/OpenTTD.yml b/recipes/OpenTTD.yml
index 4ba2dbd1..fe9da4bc 100644
--- a/recipes/OpenTTD.yml
+++ b/recipes/OpenTTD.yml
@@ -2,7 +2,7 @@ app: openttd
 
 ingredients:      
   script:
-    - #please modify the version of openttd if it will be update by up-stream!
+    - #please modify the version of openttd if it will be updated by up-stream!
     - DLD='http://binaries.openttd.org/releases/1.7.1/openttd-1.7.1-linux-generic-amd64.tar.gz'
     - wget -c $DLD
     - wget -c 'http://binaries.openttd.org/extra/opengfx/0.5.2/opengfx-0.5.2-all.zip'
@@ -33,6 +33,6 @@ script:
   - Icon=openttd
   - Exec=OpenTTD
   - Categories=Game;
-  - Comment=an open source fork for game "Transport Tycoon Deluxe".
+  - Comment=an open source fork for game Transport Tycoon Deluxe.
   - EOF
   

From 834e6bde85061732531420ea62101538f511f2a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Sun, 24 Dec 2017 23:04:54 +0800
Subject: [PATCH 28/29] Create Tales-of-MajEyal.yml

---
 recipes/Tales-of-MajEyal.yml | 37 ++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)
 create mode 100644 recipes/Tales-of-MajEyal.yml

diff --git a/recipes/Tales-of-MajEyal.yml b/recipes/Tales-of-MajEyal.yml
new file mode 100644
index 00000000..16551140
--- /dev/null
+++ b/recipes/Tales-of-MajEyal.yml
@@ -0,0 +1,37 @@
+app: Tales-of-MajEyal
+
+ingredients:      
+  script:
+    - #please modify the game version if it well be updated by up-stream!
+    - DLD='http://te4.org/dl/t-engine/t-engine4-linux64-1.5.5.tar.bz2'
+    - wget -c $DLD
+    - echo $DLD | cut -d '/' -f5 | cut -d '-' -f2 > VERSION
+    - tar -jxvf t-engine4-*.tar.bz2
+    
+
+script:
+  - cp -r ../t-engine4-*/* usr/bin/
+  - wget -c 'https://te4.org/images/awards/voratun_donator.png' -O 'tales-of-majeyal.png'
+  - ln -s "/tmp/tmp.tales-of-majeyal.te4_log_web.txt" "usr/bin/te4_log_web.txt"
+  - cat > usr/bin/tales-of-majeyal <<"EOF"
+  - #!/bin/bash
+  - HERE=$(cd "$(dirname "$0")";pwd)
+  - cd "$HERE"
+  - if [ ! -f "$HOME/.t-engine/te4_log_web.txt" ];then
+  -   mkdir -p "$HOME/.t-engine/"
+  -   touch "$HOME/.t-engine/te4_log_web.txt"
+  -   ln -s "$HOME/.t-engine/te4_log_web.txt" "/tmp/tmp.tales-of-majeyal.te4_log_web.txt"
+  - fi
+  - "$HERE/t-engine" "$@"
+  - rm "/tmp/tmp.tales-of-majeyal.te4_log_web.txt"
+  - EOF
+  - chmod +x usr/bin/tales-of-majeyal
+  - cat > tales-of-majeyal.desktop <<EOF
+  - [Desktop Entry]
+  - Type=Application
+  - Name=Tales of MajEyal
+  - Icon=tales-of-majeyal
+  - Exec=tales-of-majeyal
+  - Categories=Game;
+  - Comment=An Open Source Roguelike game
+  - EOF

From 1bf0156985db36fbe73baef572c504fde0560db4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E9=B8=A1?= <345865759@163.com>
Date: Sun, 24 Dec 2017 23:06:50 +0800
Subject: [PATCH 29/29] Update Tales-of-MajEyal.yml

---
 recipes/Tales-of-MajEyal.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/recipes/Tales-of-MajEyal.yml b/recipes/Tales-of-MajEyal.yml
index 16551140..c12580ae 100644
--- a/recipes/Tales-of-MajEyal.yml
+++ b/recipes/Tales-of-MajEyal.yml
@@ -3,7 +3,7 @@ app: Tales-of-MajEyal
 ingredients:      
   script:
     - #please modify the game version if it well be updated by up-stream!
-    - DLD='http://te4.org/dl/t-engine/t-engine4-linux64-1.5.5.tar.bz2'
+    - DLD='https://te4.org/do-download/tome-1.5.5/t-engine4-linux64-1.5.5.tar.bz2'
     - wget -c $DLD
     - echo $DLD | cut -d '/' -f5 | cut -d '-' -f2 > VERSION
     - tar -jxvf t-engine4-*.tar.bz2