quit using ./tmp

git-svn-id: file:///home/svn/framework3/trunk@9863 4d416f70-5f16-0410-b530-b9f4589650da
unstable
James Lee 2010-07-19 20:02:11 +00:00
parent 180c3e3bd0
commit 92828f2241
1 changed files with 13 additions and 8 deletions

View File

@ -12,10 +12,14 @@ if [ -n "${ARCHIVE}" ]; then
echo "${ARCHIVE} must contain an svn checkout of msf as a single directory called msf3-http" echo "${ARCHIVE} must contain an svn checkout of msf as a single directory called msf3-http"
exit 1 exit 1
fi fi
cp -r msf3-http msf3-full
fi fi
if [[ ! -d msf3-http ]]; then if [ -z "$(which makeself)" ]; then
echo "makeself needs to be installed and in the path"
exit 2
fi
if [ ! -d msf3-http ]; then
echo "Cannot continue without an svn checkout of msf as a directory called msf3-http" echo "Cannot continue without an svn checkout of msf as a directory called msf3-http"
exit 2 exit 2
fi fi
@ -42,7 +46,8 @@ build_makeself() {
# Remove any lingering symlinks from previous builds # Remove any lingering symlinks from previous builds
rm msf3 2>/dev/null rm msf3 2>/dev/null
(cd tmp; ln -sf msf3-full msf3; tar hcf msf3.tar msf3) ln -sf msf3-http msf3
tar hcf msf3.tar msf3
TITLE="Metasploit Framework v${VERSION} Installer (64-bit)" TITLE="Metasploit Framework v${VERSION} Installer (64-bit)"
INSTALLER_FILENAME="framework-${VERSION}-linux-x86_64.run" INSTALLER_FILENAME="framework-${VERSION}-linux-x86_64.run"
@ -61,12 +66,11 @@ if [ -f ${BINPATH} ]; then
# Uses the same msf3.tar as 64-bit, so we don't need to regenerate it. # Uses the same msf3.tar as 64-bit, so we don't need to regenerate it.
build_makeself "${TITLE}" "${INSTALLER_FILENAME}" "${BINPATH}" build_makeself "${TITLE}" "${INSTALLER_FILENAME}" "${BINPATH}"
if [ ! -d msf3-mini ]; then ./minify.sh msf3-http
./minify.sh msf3-full
fi
rm msf3 rm msf3 msf3.tar
(cd tmp; ln -sf msf3-mini msf3; tar hcf msf3.tar msf3) ln -sf msf3-mini msf3
tar hcf msf3.tar msf3
TITLE="Metasploit Framework v${VERSION} Miniature Installer (32-bit)" TITLE="Metasploit Framework v${VERSION} Miniature Installer (32-bit)"
INSTALLER_FILENAME="framework-${VERSION}-mini-linux-i686.run" INSTALLER_FILENAME="framework-${VERSION}-mini-linux-i686.run"
@ -74,4 +78,5 @@ if [ -f ${BINPATH} ]; then
build_makeself "${TITLE}" "${INSTALLER_FILENAME}" "${BINPATH}" build_makeself "${TITLE}" "${INSTALLER_FILENAME}" "${BINPATH}"
fi fi
rm msf3 msf3.tar