Commit ff42827e authored by Leigh B. Stoller's avatar Leigh B. Stoller

Oops, fix a bug with php package install.

parent 70a4c3f9
......@@ -356,17 +356,27 @@ Phase "tftp", "Setting up directories for tftp", sub {
Phase "ports", "Installing ports", sub {
Phase "packages", "Installing packages", sub {
if (!ExecQuiet("$PKG_INFO -e $BOSS_PORT") &&
(($FBSD_VERSION == 4) || !ExecQuiet("$PKG_INFO -e $PHP4_PORT"))) {
PhaseSkip("Ports already installed");
}
if (!$packagedir) {
PhaseSkip("No package directory provided");
Phase "main", "Installing main package", sub {
if (!ExecQuiet("$PKG_INFO -e $BOSS_PORT")) {
PhaseSkip("Package already installed");
}
if (!$packagedir) {
PhaseSkip("No package directory provided");
}
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $BOSS_PORT");
};
if ($FBSD_VERSION > 4) {
Phase "php4", "Installing php4 package", sub {
if (!ExecQuiet("$PKG_INFO -e $PHP4_PORT")) {
PhaseSkip("Port already installed");
}
if (!$packagedir) {
PhaseSkip("No package directory provided");
}
ExecQuietFatal("$ENV PKG_PATH=$packagedir ".
" $PKG_ADD $PHP4_PORT");
};
}
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $BOSS_PORT")
if (ExecQuiet("$PKG_INFO -e $BOSS_PORT"));
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $PHP4_PORT")
if ($FBSD_VERSION > 4 && ExecQuiet("$PKG_INFO -e $PHP4_PORT"));
};
PhaseSkip("Package directory provided; not installing from source")
if ($packagedir);
......
......@@ -289,17 +289,27 @@ Phase "dirs", "Setting directory permissions", sub {
Phase "ports", "Installing ports", sub {
Phase "packages", "Installing packages", sub {
if (!ExecQuiet("$PKG_INFO -e $OPS_PORT") &&
(($FBSD_VERSION == 4) || !ExecQuiet("$PKG_INFO -e $PHP4_PORT"))) {
PhaseSkip("Ports already installed");
}
if (!$packagedir) {
PhaseSkip("No package directory provided");
Phase "main", "Installing main package", sub {
if (!ExecQuiet("$PKG_INFO -e $OPS_PORT")) {
PhaseSkip("Package already installed");
}
if (!$packagedir) {
PhaseSkip("No package directory provided");
}
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $OPS_PORT");
};
if ($FBSD_VERSION > 4) {
Phase "php4", "Installing php4 package", sub {
if (!ExecQuiet("$PKG_INFO -e $PHP4_PORT")) {
PhaseSkip("Package already installed");
}
if (!$packagedir) {
PhaseSkip("No package directory provided");
}
ExecQuietFatal("$ENV PKG_PATH=$packagedir ".
" $PKG_ADD $PHP4_PORT");
};
}
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $OPS_PORT")
if (ExecQuiet("$PKG_INFO -e $OPS_PORT"));
ExecQuietFatal("$ENV PKG_PATH=$packagedir $PKG_ADD $PHP4_PORT")
if ($FBSD_VERSION > 4 && ExecQuiet("$PKG_INFO -e $PHP4_PORT"));
};
Phase "fs-packages", "Installing FS packages", sub {
if (!$ISFS) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment