Merge pull request #6417 from EOSIO/fix-deb-package-names

Fix deb package names
EOSIO · Nov 30, 2018 · 549c96c · 549c96c
2 parents d1caabb + 7b2b5f7
commit 549c96c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -40,12 +40,12 @@ $ brew remove eosio
 #### Ubuntu 18.04 Debian Package Install
 ```sh
 $ wget https://github.com/eosio/eos/releases/download/v1.5.0-rc2/eosio_1.5.0-rc2-1-ubuntu-18.04_amd64.deb
-$ sudo apt install ./eosio_1.5.0-rc2-1-ubuntu-18.04_amd64.deb
+$ sudo apt install ./eosio_1.5.0-rc2-ubuntu-18.04_amd64.deb
 ```
 #### Ubuntu 16.04 Debian Package Install
 ```sh
 $ wget https://github.com/eosio/eos/releases/download/v1.5.0-rc2/eosio_1.5.0-rc2-1-ubuntu-16.04_amd64.deb
-$ sudo apt install ./eosio_1.5.0-rc2-1-ubuntu-16.04_amd64.deb
+$ sudo apt install ./eosio_1.5.0-rc2-ubuntu-16.04_amd64.deb
 ```
 #### Debian Package Uninstall
 ```sh

diff --git a/scripts/generate_deb.sh b/scripts/generate_deb.sh
@@ -1,18 +1,25 @@
 #! /bin/bash
 
-NAME="${PROJECT}_${VERSION}-1_amd64"
 PREFIX="usr"
 SPREFIX=${PREFIX}
 SUBPREFIX="opt/${PROJECT}/${VERSION}"
 SSUBPREFIX="opt\/${PROJECT}\/${VERSION}"
+RELEASE="${VERSION_SUFFIX}"
+
+# default release to "1" if there is no suffix
+if [[ -z $RELEASE ]]; then
+  RELEASE="1"
+fi
+
+NAME="${PROJECT}_${VERSION_NO_SUFFIX}-${RELEASE}_amd64"
 
 DEPS_STR=""
 for dep in "${DEPS[@]}"; do
    DEPS_STR="${DEPS_STR} Depends: ${dep}"
 done
 mkdir -p ${PROJECT}/DEBIAN
 echo "Package: ${PROJECT} 
-Version: ${VERSION}
+Version: ${VERSION_NO_SUFFIX}-${RELEASE}
 Section: devel
 Priority: optional
 Depends: libbz2-dev (>= 1.0), libssl-dev (>= 1.0), libgmp3-dev, build-essential, libicu-dev, zlib1g-dev