Set Version: in control based on git describe --tags.

diff --git a/.gitignore b/.gitignore
index da9c03f4b51b81416481f3c23a171fc0a0b1fb6f..f72698bf32505fc70a545d21ae1288f4565cb56d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ sysroot
 MobileCydia
 CydiaAppliance
 _
-*.deb
+Cydia.deb
+debs
 .DS_Store
 *.o

diff --git a/control b/control
index bee66e405ded28f0a1bb54dc3604f73c6ece392f..7bf1990eb15de79d443b182c460dd7e73b880568 100644 (file)
--- a/control
+++ b/control
@@ -3,7 +3,7 @@ Priority: required
 Section: Packaging
 Maintainer: Jay Freeman (saurik) <saurik@saurik.com>
 Architecture: iphoneos-arm
-Version: 1.0.3229-1
+Version: 
 Replaces: com.sosiphone.addcydia
 Depends: apr-lib, apt7-lib, apt7-key, darwintools, pcre, sed, shell-cmds, system-cmds, uikittools (>= 1.0.3198), firmware (>= 3.2)
 Pre-Depends: dpkg (>= 1.14.25-8)

diff --git a/control.sh b/control.sh
new file mode 100755 (executable)
index 0000000..537cb66
--- /dev/null
+++ b/control.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+dir=$1
+dir=${dir:=_}
+sed -e "s@^\(Version:\).*@\1 $(./version.sh)@" control
+echo "Installed-Size: $(du -s "${dir}" | cut -f 1)"

diff --git a/makefile b/makefile
index b96733f227eecdd40e0b1d1d44790e56a3e284c7..5868accc9bbf09d64f58a32744cc9bcefc14bbcf 100644 (file)
--- a/makefile
+++ b/makefile
@@ -86,12 +86,15 @@ package: MobileCydia
        cp -a CydiaSettings.bundle _/System/Library/PreferenceBundles/CydiaSettings.bundle
        
        mkdir -p _/DEBIAN
-       echo "$$(cat control)"$$'\nInstalled-Size: '"$$(du -s _ | cut -f 1)" > _/DEBIAN/control
+       ./control.sh _ >_/DEBIAN/control
        
        sudo chown -R 0 _
        sudo chgrp -R 0 _
        sudo chmod 6755 _/Applications/Cydia.app/MobileCydia
        
-       $(dpkg) -b _ $(shell grep ^Package: control | cut -d ' ' -f 2-)_$(shell grep ^Version: control | cut -d ' ' -f 2)_iphoneos-arm.deb
+       mkdir -p debs
+       ln -sf debs/cydia_$$(./version.sh)_iphoneos-arm.deb Cydia.deb
+       $(dpkg) -b _ Cydia.deb
+       readlink Cydia.deb
 
 .PHONY: all clean sign

diff --git a/version.sh b/version.sh
new file mode 100755 (executable)
index 0000000..2508390
--- /dev/null
+++ b/version.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+ver=$(git describe --tags --dirty="+")
+ver=${ver#v}
+ver=${ver//-/.}
+echo "${ver}"