From f481ae93718758593e06a9615ceca4775405e5e5 Mon Sep 17 00:00:00 2001
From: Eli Uriegas <eli.uriegas@docker.com>
Date: Wed, 11 Jul 2018 00:27:21 +0000
Subject: [PATCH] `~` -> `-` for dev versions

tilde doesn't play nice with docker images so to be uniform let's
replace the tilde with a dash

Signed-off-by: Eli Uriegas <eli.uriegas@docker.com>
Upstream-commit: ad988a9a4020eaf44245659a8fe7053a2e9b874b
Component: packaging
---
 components/packaging/deb/gen-deb-ver       | 2 +-
 components/packaging/rpm/gen-rpm-ver       | 4 ++--
 components/packaging/static/gen-static-ver | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/components/packaging/deb/gen-deb-ver b/components/packaging/deb/gen-deb-ver
index bc1e321e26..e5fb1c1499 100755
--- a/components/packaging/deb/gen-deb-ver
+++ b/components/packaging/deb/gen-deb-ver
@@ -56,7 +56,7 @@ if [[ "$VERSION" == *-dev ]]; then
     gitUnix="$($GIT_COMMAND log -1 --pretty='%at')"
     gitDate="$($DATE_COMMAND --date "@$gitUnix" +'%Y%m%d.%H%M%S')"
     gitCommit="$($GIT_COMMAND log -1 --pretty='%h')"
-    debVersion="0.${gitDate}~${gitCommit}"
+    debVersion="0.${gitDate}-${gitCommit}"
     origVersion=$debVersion
 
     # $ dpkg --compare-versions 1.5.0 gt 1.5.0~rc1 && echo true || echo false
diff --git a/components/packaging/rpm/gen-rpm-ver b/components/packaging/rpm/gen-rpm-ver
index 1db470e89b..30c442370d 100755
--- a/components/packaging/rpm/gen-rpm-ver
+++ b/components/packaging/rpm/gen-rpm-ver
@@ -49,9 +49,9 @@ if [[ "$rpmVersion" == *-dev ]] || [ -n "$($GIT_COMMAND status --porcelain)" ];
     gitDate="$($DATE_COMMAND --date "@$gitUnix" +'%Y%m%d.%H%M%S')"
     gitCommit="$($GIT_COMMAND log -1 --pretty='%h')"
     # gitVersion is now something like '20150128.112847.17e840a'
-    rpmVersion="0.${gitDate}~${gitCommit}"
+    rpmVersion="0.${gitDate}-${gitCommit}"
     rpmRelease="0"
-    origVersion="0.${gitDate}~${gitCommit}"
+    origVersion="0.${gitDate}-${gitCommit}"
 fi
 
 # Replace any other dashes with periods
diff --git a/components/packaging/static/gen-static-ver b/components/packaging/static/gen-static-ver
index b77b4b29a0..44870ff7c8 100755
--- a/components/packaging/static/gen-static-ver
+++ b/components/packaging/static/gen-static-ver
@@ -19,7 +19,7 @@ if [[ "$VERSION" == *-dev ]]; then
     gitUnix="$($GIT_COMMAND log -1 --pretty='%at')"
     gitDate="$($DATE_COMMAND --date "@$gitUnix" +'%Y%m%d.%H%M%S')"
     gitCommit="$($GIT_COMMAND log -1 --pretty='%h')"
-    staticVersion="0.${gitDate}~${gitCommit}"
+    staticVersion="0.${gitDate}-${gitCommit}"
 fi
 
 echo "$staticVersion"