From 119d9fae7499c4f2a20eba3753d6e76a09cc8783 Mon Sep 17 00:00:00 2001 From: Nathan Wagner Date: Tue, 31 Jul 2018 20:46:34 +0000 Subject: [PATCH] add / to directory --- Makefile | 6 +++--- zpm-ipkgfile | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index f0a430e..8548b30 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ curdir=$(shell pwd) ZPKGBIN=zpm-addfile zpm-extract zpm-init zpm-vercmp zpm-stat zpm-hash \ zpm-findpkg zpm-shell zpm-soneed -SCRIPTS=zpm zpm-install zpm-merge zpm-list +SCRIPTS=zpm zpm-install zpm-merge zpm-list zpm-preserve COMPILED=$(ZPKGBIN) PROGRAMS=$(SCRIPTS) $(COMPILED) @@ -27,11 +27,11 @@ d: printf '%s\n' $(LZMAOBJ) printf '%s\n' $(PATH) -package: zpm-0.1-1.zpm +package: zpm-$(ZPMVER)-1.zpm ZPM:= ./zpm -P scripts:bin:. -zpm-0.1-1.zpm: programs +zpm-$(ZPMVER)-1.zpm: programs rm -f $@ $(ZPM) newpackage -f $@ -v 0.1 zpm $(ZPM) addtopackage -u root -g root -f $@ -P /sbin -v 0.1 zpm $(PROGRAMS) diff --git a/zpm-ipkgfile b/zpm-ipkgfile index de97711..281fcca 100755 --- a/zpm-ipkgfile +++ b/zpm-ipkgfile @@ -58,6 +58,8 @@ for path in $*; do dir=$pkgroot/$dir dir=${dir%/.} # if [ "$dir" = "//" ]; then dir=/ ; fi + else + dir="/$dir" fi # TODO generate some unique hash -- 2.40.0