From 5c353d27b63d3540a479c567730121c73a6a452f Mon Sep 17 00:00:00 2001
From: Fredrik Noring <noring@nocrew.org>
Date: Thu, 14 Oct 1999 22:54:22 +0200
Subject: [PATCH] Small fixes.
Rev: bin/mkpackage.pike:1.3
---
bin/mkpackage.pike | 12 +++++++++---
1 file changed, 9 insertions(+), 3 deletions(-)
diff --git a/bin/mkpackage.pike b/bin/mkpackage.pike
index e7b7e28eb2..6ac2827279 100644
--- a/bin/mkpackage.pike
+++ b/bin/mkpackage.pike
@@ -63,6 +63,11 @@ class Package
return sprintf("%ctmP%07x", c, random(0xfffffff));
}
+ string basename(string path)
+ {
+ return (path/"/")[-1];
+ }
+
string make(string package_filename)
{
string setup_filename = unique_name('S')+".sh";
@@ -71,7 +76,7 @@ class Package
string setup = ("#!/bin/sh\n"
"TARFILE=\"$1\"; shift; ARGS=''\n"
"CONTENTS=`tar tf \"$TARFILE\" | sed -ne '/^"+
- (replace(install_filename, ".", "\\.")/"/")[-1]+"/,$p'`\n"
+ replace(basename(install_filename), ".", "\\.")+"/,$p'`\n"
// Check all arguments for possible options.
"while [ $# != 0 ]\n"
"do\n"
@@ -89,8 +94,9 @@ class Package
"mkdir "+unpack_directory+"\n"
"(cd "+unpack_directory+"\n"
" tar xf ../\"$TARFILE\" $CONTENTS\n"
- " ./"+(pike_filename/"/")[-1]+" "
- "--script \"`pwd`\"/"+install_filename+")\n"
+ " ./"+basename(pike_filename)+" "
+ "--script \"`pwd`\"/"+
+ basename(install_filename)+")\n"
"rm -rf "+setup_filename+" "+unpack_directory+"\n");
string bootstrap = sprintf("#!/bin/sh\n"
--
GitLab