Skip to content

Commit

Permalink
Fix ARCH detection in build-selfexecutable and Makefile
Browse files Browse the repository at this point in the history
arch=$(uname -m)
if [ "$arch" == 'x86_64' ]
then
   ARCHITECTURE=amd64
else
   ARCHITECTURE=i386
fi
  • Loading branch information
eloaders committed Dec 26, 2013
1 parent 9247cea commit 777c5ed
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ GBC = /usr/bin/gbc3
GBCOPTS = -e -a -g -t -p -m
GBA = gba3
CC = gcc
ARCH=`arch`
ARCH=`uname -m`
bindir ?= /usr/bin
INSTALL = install -m
bzr_revision =
Expand Down Expand Up @@ -131,7 +131,7 @@ self:
@if [ -e "/bin/bzip2" ];then \
printf "\033[1;31m:: \033[0m$1\n" & $(MAKESELF) $(MAKESELF_OPT) --bzip2 --complevel $(COMPRESSION_SELF_LEVEL) ./inex i-nex.$(ARCH).bzip2.run $(APP_NAME) $(INSTALL_SELF_SCRIPT); \
fi

mv ./*.run ../

clean:

Expand Down
8 changes: 7 additions & 1 deletion build-selfexecutable
Original file line number Diff line number Diff line change
@@ -1,7 +1,13 @@
#!/bin/bash
URL_DOWN="http://ppa.launchpad.net/nemh/gambas3/ubuntu/pool/main/g/gambas3/"
wget -c $URL_DOWN
ARCHITECTURE=$(dpkg --print-architecture)
arch=$(uname -m)
if [ "$arch" == 'x86_64' ]
then
ARCHITECTURE=amd64
else
ARCHITECTURE=i386
fi
GB3_GB_IMAGE=$(cat ./index.html | egrep gambas3-gb-image_ | egrep saucy | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)

GB3_GB_GTK=$(cat ./index.html | egrep gambas3-gb-gtk_ | egrep saucy | egrep $ARCHITECTURE.deb | sed -n '1p' | awk {'print $6'} | cut -d ">" -f 2 | cut -d '<' -f 1)
Expand Down

0 comments on commit 777c5ed

Please sign in to comment.