Final build touch-ups

MasFlam · Dec 30, 2020 · 4291b06 · 4291b06
1 parent 98ff49a
commit 4291b06
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/Makefile b/Makefile
@@ -5,17 +5,18 @@ endif
 .PHONY: help build package install
 
 help:
-	@echo "make build - Build the package"
-	@echo "make package - Tarball the built package"
-	@echo "make [prefix=/usr/local/bin] install - Install to [prefix]'
+	@echo 'make build - Build the package'
+	@echo 'make package - Tarball the built package'
+	@echo 'make [prefix=/usr/local/bin] install - Install to [prefix]'
 
 build:
 	./build.jl
 
 package:
 	echo '#!/bin/sh' >> build/SatoriCLI/install.sh
-	echo cp -r build/SatoriCLI "$${1:-/usr/local/bin}" >> build/SatoriCLI/install.sh
-	echo ln -s SatoriCLI/bin/SatoriCLI "$${1:-/usr/local/bin}"/satori-cli >> build/SatoriCLI/install.sh
+	echo cp -r build/SatoriCLI \"$$\{1:-/usr/local/bin\}\" >> build/SatoriCLI/install.sh
+	echo ln -s SatoriCLI/bin/SatoriCLI \"$$\{1:-/usr/local/bin\}\"/satori-cli >> build/SatoriCLI/install.sh
+	chmod +x build/SatoriCLI/install.sh
 	cp LICENSE build/SatoriCLI/LICENSE
 	tar -czf build/SatoriCLI.tar.gz build/SatoriCLI
 

diff --git a/build.jl b/build.jl
@@ -29,7 +29,6 @@ cd(projdir) do
 				push!(sofiles, dest |> basename)
 				dest = joinpath("build/SatoriCLI/lib/", readlink(dest))
 			end
-			occursin("pcre", filename) && println("after while, dest=$dest")
 			push!(sofiles, dest |> basename)
 		end
 	end