build: use posix sed -E instead of -r (machinekit#294)

gb-g · Oct 15, 2019 · 3863795 · 3863795
1 parent c41f298
commit 3863795
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/build/travis/job_macos/bintray_app.sh b/build/travis/job_macos/bintray_app.sh
@@ -63,13 +63,13 @@ FILE="$1"
 # Package: MachinekitClient-Nightly-MacOSX-<branch>-<arch> (e.g. MachinekitClient-Nightly-master-x64)
 
 # Read app name from file name (get characters before first dash)
-APPNAME="$(basename "$FILE" | sed -r 's|^([^-]*)-.*$|\1|')"
+APPNAME="$(basename "$FILE" | sed -E 's|^([^-]*)-.*$|\1|')"
 
 # Read version from the file name (get characters between first and last dash)
-VERSION="$(basename "$FILE" | sed -r 's|^[^-]*-(.*)-[^-]*$|\1|')"
+VERSION="$(basename "$FILE" | sed -E 's|^[^-]*-(.*)-[^-]*$|\1|')"
 
 # Read architecture from file name (characters between last dash and .dmg)
-ARCH="$(basename "$FILE" | sed -r 's|^.*-([^-]*)\.dmg$|\1|')"
+ARCH="$(basename "$FILE" | sed -E 's|^.*-([^-]*)\.dmg$|\1|')"
 
 case "${ARCH}" in
   x86_64|x64|amd64 )
@@ -107,10 +107,10 @@ else
   url_query="publish=1&override=1" # Automatically publish, overwrite existing
 
   # Get Git branch from $VERSION (get characters between first and last dash)
-  BRANCH="$(echo $VERSION | sed -r 's|^[^-]*-(.*)-[^-]*$|\1|')"
+  BRANCH="$(echo $VERSION | sed -E 's|^[^-]*-(.*)-[^-]*$|\1|')"
 
   # Get Git commit from $VERSION (get characters after last dash)
-  COMMIT="$(echo $VERSION | sed -r 's|^.*-([^-]*)$|\1|')"
+  COMMIT="$(echo $VERSION | sed -E 's|^.*-([^-]*)$|\1|')"
 
   PCK_NAME="$APPNAME-MacOSX-$BRANCH-$ARCH"
   BINTRAY_REPO="${BINTRAY_REPO:-MachinekitClient-Development}" # env, or use "MachinekitClient-Development"

diff --git a/build/travis/job_macos/bintray_lib.sh b/build/travis/job_macos/bintray_lib.sh
@@ -63,13 +63,13 @@ FILE="$1"
 # Package: QtQuickVcp-Nightly-MacOSX-<branch>-<arch> (e.g. QtQuickVcp-Nightly-master-x64)
 
 # Read app name from file name (get characters before first dash)
-APPNAME="$(basename "$FILE" | sed -r 's|^([^-]*)-.*$|\1|')"
+APPNAME="$(basename "$FILE" | sed -E 's|^([^-]*)-.*$|\1|')"
 
 # Read version from the file name (get characters between first and almost last dash)
-VERSION="$(basename "$FILE" | sed -r 's|^[^-]*-(.*)-[^-]*-[^-]*$|\1|')"
+VERSION="$(basename "$FILE" | sed -E 's|^[^-]*-(.*)-[^-]*-[^-]*$|\1|')"
 
 # Read architecture from file name (characters between last dash and .tar.gz)
-ARCH="$(basename "$FILE" | sed -r 's|^.*-([^-]*)\.tar.gz$|\1|')"
+ARCH="$(basename "$FILE" | sed -E 's|^.*-([^-]*)\.tar.gz$|\1|')"
 
 case "${ARCH}" in
   x86_64|x64|amd64 )
@@ -107,10 +107,10 @@ else
   url_query="publish=1&override=1" # Automatically publish, overwrite existing
 
   # Get Git branch from $VERSION (get characters between first and last dash)
-  BRANCH="$(echo $VERSION | sed -r 's|^[^-]*-(.*)-[^-]*$|\1|')"
+  BRANCH="$(echo $VERSION | sed -E 's|^[^-]*-(.*)-[^-]*$|\1|')"
 
   # Get Git commit from $VERSION (get characters after last dash)
-  COMMIT="$(echo $VERSION | sed -r 's|^.*-([^-]*)$|\1|')"
+  COMMIT="$(echo $VERSION | sed -E 's|^.*-([^-]*)$|\1|')"
 
   PCK_NAME="$APPNAME-MacOSX-$BRANCH-$ARCH"
   BINTRAY_REPO="${BINTRAY_REPO:-QtQuickVcp-Development}" # env, or use "QtQuickVcp-Development"