Alternate CI build fix attempt

Ulauncher · Aug 21, 2021 · abce451 · abce451
1 parent b3fbd45
commit abce451
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/scripts/build-deb.sh b/scripts/build-deb.sh
@@ -101,7 +101,4 @@ build-deb () {
         error "Second argument must be either --deb or --upload"
         exit 1
     fi
-
-    # Rename dpkg-buildpackage output file to be consistent with our naming 
-    mv "$tmpdir/ulauncher_${deb_version}_all.deb" "$tmpdir/ulauncher_${version}_all.deb"
 }
diff --git a/scripts/make-release.sh b/scripts/make-release.sh
@@ -30,6 +30,7 @@ make-release() {
 }
 
 create_deb() {
+    DEB_VERSION=$(echo "$VERSION" | tr "-" "~")
     step1="ln -s /var/node_modules data/preferences" # take node modules from cache
     step2="ln -s /var/bower_components data/preferences"
     step3="./ul test"
@@ -45,7 +46,7 @@ create_deb() {
         bash -c "$step1 && $step2 && $step3 && $step4 && $step5"
     set +x
     docker cp ulauncher-deb:/tmp/ulauncher_$VERSION.tar.gz .
-    docker cp ulauncher-deb:/tmp/ulauncher_${VERSION}_all.deb .
+    docker cp "ulauncher-deb:/tmp/ulauncher_${DEB_VERSION}_all.deb" "ulauncher_${VERSION}_all.deb"
     docker rm ulauncher-deb
 }