Merge pull request #40 from bdbcat/master

Correct cloudsmith upload script template

README

@@ -27,7 +27,7 @@ For OSX standalone build in weather_routing_pi directory:
 
 License
 =======
-The plugin code is licensed under the terms of the GPL v3+
+The plugin code is licensed under the terms of the GPL v3+ 
 
 Part of the icons made by Smashicons (https://www.flaticon.com/authors/smashicons) from Flaticon (https://www.flaticon.com/) and is licensed under CC BY 3.0 (http://creativecommons.org/licenses/by/3.0)
 

cmake/in-files/circleci-upload.sh.in

@@ -70,26 +70,32 @@ else
     PKG_REPO="$UNSTABLE_REPO"
 fi
 
+COMMON_NAME_SUB=@COMMON_NAME@
+echo $COMMON_NAME_SUB
+
+echo $tarball_name
+echo $tarball
+
 sudo sed -i -e "s|--pkg_repo--|$PKG_REPO|"  $xml
-sudo sed -i -e "s|--name--|$COMMON_NAME|" $xml
+sudo sed -i -e "s|--name--|$tarball_name|" $xml
 sudo sed -i -e "s|--version--|$VERSION|" $xml
 sudo sed -i -e "s|--filename--|$tarball_basename|" $xml
 
 cat $xml
 ls -l build
 
-cloudsmith push raw --republish --no-wait-for-sync \
-    --name @PACKAGE@-@PKG_TARGET@-@PKG_TARGET_VERSION@-metadata \
-    --version ${VERSION} \
-    --summary "@PACKAGE@ opencpn plugin metadata for automatic installation" \
-    $REPO $xml
-
 cloudsmith push raw --republish --no-wait-for-sync \
     --name $tarball_name \
     --version ${VERSION} \
     --summary "@PACKAGE@ opencpn plugin tarball for automatic installation" \
     $REPO $tarball
 
+cloudsmith push raw --republish --no-wait-for-sync \
+    --name @PACKAGE@-@PKG_TARGET@-@PKG_TARGET_VERSION@-metadata \
+    --version ${VERSION} \
+    --summary "@PACKAGE@ opencpn plugin metadata for automatic installation" \
+    $REPO $xml
+
 cloudsmith push raw --republish --no-wait-for-sync \
     --name @PACKAGE@-@PKG_TARGET@-@PKG_TARGET_VERSION@.${PKG_EXT} \
     --version ${VERSION} \