X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=tools%2Fbuild-deb.sh;h=6e3755ba5fbd2a1c4d15838d7db9a683418b0913;hb=d7ba2f600ed57196cdcffbf79e6637252528da34;hp=c09124f125134084f0797562e96973a7ab9a5a0a;hpb=c3861955e0d3a026a4a38ca053992256068aeaed;p=micro.git

diff --git a/tools/build-deb.sh b/tools/build-deb.sh
index c09124f1..6e3755ba 100755
--- a/tools/build-deb.sh
+++ b/tools/build-deb.sh
@@ -1,7 +1,5 @@
-# Builds two .deb packages, for x86 (i386) and x86_64 (amd64)
-# These packages are the bare minimum, which means that they can be installed
-# But they do not feature everything yet.
-# This does not mean that the editor itself is affected.
+# Builds three .deb packages, for x86 (i386) and x86_64 (amd64) and arm (arm)
+# These packages include a manpage, an icon, and a desktop file.
 
 function getControl() {
 echo Section: editors
@@ -34,17 +32,17 @@ function installFiles() {
 
 version=$1
 if [ "$1" == "" ]
-then
-  version=$(go run build-version.go)
+  then
+    version=$(go run build-version.go | tr "-" ".")
 fi
 echo "Building packages for Version '$version'"
-echo "Running Cross-Compile"
-./cross-compile.sh $version
-
+echo "Compiling."
+./compile-linux.sh $version
+       
 echo "Beginning package build process"
-
+        
 PKGPATH="../packages/deb"
-
+        
 rm -fr $PKGPATH
 mkdir -p $PKGPATH/amd64/DEBIAN/
 mkdir -p $PKGPATH/i386/DEBIAN/
@@ -54,23 +52,23 @@ getControl "amd64" "$version" > $PKGPATH/amd64/DEBIAN/control
 tar -xzf "../binaries/micro-$version-linux64.tar.gz" "micro-$version/micro"
 mkdir -p $PKGPATH/amd64/usr/local/bin/
 mv "micro-$version/micro" "$PKGPATH/amd64/usr/local/bin/"
-
+        
 getControl "i386" "$version" > $PKGPATH/i386/DEBIAN/control
 tar -xzf "../binaries/micro-$version-linux32.tar.gz" "micro-$version/micro"
 mkdir -p $PKGPATH/i386/usr/local/bin/
 mv "micro-$version/micro" "$PKGPATH/i386/usr/local/bin/"
-
+        
 getControl "arm" "$version" > $PKGPATH/arm/DEBIAN/control
 tar -xzf "../binaries/micro-$version-linux-arm.tar.gz" "micro-$version/micro"
 mkdir -p $PKGPATH/arm/usr/local/bin
 mv "micro-$version/micro" "$PKGPATH/arm/usr/local/bin"
-
+        
 rm -rf "micro-$version"
-
+        
 installFiles $PKGPATH "amd64"
 installFiles $PKGPATH "i386"
 installFiles $PKGPATH "arm"
-
+        
 dpkg -b "$PKGPATH/amd64/" "../packages/micro-$version-amd64.deb"
 dpkg -b "$PKGPATH/i386/" "../packages/micro-$version-i386.deb"
 dpkg -b "$PKGPATH/arm/" "../packages/micro-$version-arm.deb"