Import from pkgbuild.com service

3 files changed, 13 insertions, 5 deletions

diff --git a/.AURINFO b/.AURINFO
index 453f6b90f9c3..184c74916f22 100644
--- a/.AURINFO
+++ b/.AURINFO
@@ -1,6 +1,6 @@
 pkgbase = slic3r-git
 	pkgdesc = Slic3r is an STL-to-GCODE translator for RepRap 3D printers, aiming to be a modern and fast alternative to Skeinforge.
-	pkgver = 0
+	pkgver = a
 	pkgrel = 13
 	url = http://slic3r.org/
 	arch = any
@@ -33,6 +33,9 @@ pkgbase = slic3r-git
 	source = git+https://github.com/alexrj/Slic3r.git
 	source = slic3r.desktop
 	source = slic3r.pl
+	md5sums = SKIP
+	md5sums = 1b561afff48c79f86889664375d179ed
+	md5sums = 1371d698799ee97a43d22f6436a2e619
 
 pkgname = slic3r-git
 
diff --git a/.SRCINFO b/.SRCINFO
index 7dc8b121e2eb..184c74916f22 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = slic3r-git
 	pkgdesc = Slic3r is an STL-to-GCODE translator for RepRap 3D printers, aiming to be a modern and fast alternative to Skeinforge.
-	pkgver = 0
+	pkgver = a
 	pkgrel = 13
 	url = http://slic3r.org/
 	arch = any
diff --git a/PKGBUILD b/PKGBUILD
index 440fe46ad422..9ffdf1cb9bcb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 #TODO: integrate with makepkg.d/
 
 pkgname=slic3r-git
-pkgver=0
+pkgver=a
 pkgrel=13
 pkgdesc="Slic3r is an STL-to-GCODE translator for RepRap 3D printers, aiming to be a modern and fast alternative to Skeinforge."
 arch=('any')
@@ -32,6 +32,8 @@ md5sums=('SKIP'
          '1371d698799ee97a43d22f6436a2e619')
 
 _gitname="Slic3r"
+#TODO: derrive this from pkgbuild "fragment", skip checkout/reset if fragment is set in source (no need for doing this twice)
+_gitfragment="stable"
 
 countdown() {
   local i
@@ -53,10 +55,12 @@ prepare() {
 
 # TODO: After all done ramp up pkgver++
 # TODO: Remind user about stable branch and others
-# TODO: ASK for disabling checks
+# TODO: ASK for disabling checks in case of failure (or even press something to ignore for N seconds)
 #------------------------------------------------------
 # Welcome new interactive config overlord
 
+  #TODO: Display warning with current branch/commit, just before prompt to press key
+
   [[ "$(cat /proc/$$/cmdline)" != *noconfirm* ]] && tty -s && {
     countdown 3 & countdown_pid=$!
     read -s -n 1 -t 3 ikey || true
@@ -69,6 +73,7 @@ prepare() {
       "branch/commit")
         cd "$_src_dir"
         # Pick a branch - default is stable… for now
+        # TODO: derrive actual current state of selection (commit/branch from fragment)
         branches=( $(git ls-remote --heads origin  | sed 's?.*refs/heads/??' | awk '{printf $1; if ($1 == "stable") printf " on ";else printf " off "}') )
         branch=$(dialog --keep-tite --backtitle "$pkgname" --no-items --radiolist 'Pick branch' 0 0 0 ${branches[*]} 2>&1 >/dev/tty)
         unset branches
@@ -102,7 +107,7 @@ prepare() {
     esac
   else
     cd "$_src_dir"
-    git checkout stable -f
+    git checkout "${_gitfragment}" -f
   fi
 
   cd "$_src_dir"