From 8891d15f02490c4650bc615d48c4fd0ce43d78a5 Mon Sep 17 00:00:00 2001 From: Josh Yelon Date: Fri, 22 Jun 2007 05:45:35 +0000 Subject: [PATCH] More fixes for --installer --- doc/makepanda/makepanda.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/makepanda/makepanda.py b/doc/makepanda/makepanda.py index 95e792741f..3d3a00f1a3 100755 --- a/doc/makepanda/makepanda.py +++ b/doc/makepanda/makepanda.py @@ -4674,7 +4674,7 @@ def MakeInstallerLinux(): if (os.path.exists("/usr/bin/dpkg-deb")): oscmd("dpkg --print-architecture > built/tmp/architecture.txt") if (os.path.exists("/usr/bin/rpmbuild")): - oscmd("rpm -E '{%_arch}' > built/tmp/architecture.txt") + oscmd("rpm -E '%_arch' > built/tmp/architecture.txt") ARCH=ReadFile("built/tmp/architecture.txt").strip() oscmd("rm -rf linuxroot data.tar.gz control.tar.gz panda3d.spec "+ARCH) oscmd("mkdir -p linuxroot/usr/bin") @@ -4723,8 +4723,7 @@ def MakeInstallerLinux(): txt = INSTALLER_SPEC_FILE[1:].replace("VERSION",VERSION).replace("PANDASOURCE",PANDASOURCE) WriteFile("panda3d.spec", txt) oscmd("rpmbuild --define '_rpmdir "+PANDASOURCE+"' -bb panda3d.spec") - if (os.path.exists(ARCH+"/panda3d-"+VERSION+"-1."+ARCH+".rpm")): - oscmd("mv "+ARCH+"/panda3d-"+VERSION+"-1."+ARCH+".rpm .") + oscmd("mv "+ARCH+"/panda3d-"+VERSION+"-1."+ARCH+".rpm .") oscmd("chmod -R 755 linuxroot") oscmd("rm -rf linuxroot data.tar.gz control.tar.gz panda3d.spec "+ARCH)