| Revision | ef27f868cb18b54242eceb1e5a86609008aacd7c (tree) |
|---|---|
| Zeit | 2020-10-14 20:04:52 |
| Autor | matsuand <30614168+matsuand@user...> |
| Commiter | matsuand |
[BLFS] Renamed s_install-apache script, and deleted old one.
BLFS/install-apache.sh (diff) BLFS/s_install-apache.sh| @@ -2,7 +2,7 @@ | ||
| 2 | 2 | |
| 3 | 3 | . ./_blfsset.sh |
| 4 | 4 | |
| 5 | -TARGET=blfs-bootscripts-$BOOTSCRIPTDATE | |
| 5 | +TARGET=blfs-systemd-units-$S_BOOTSCRIPTDATE | |
| 6 | 6 | SCRIPT=install-httpd |
| 7 | 7 | TARGETBALL=$DLD/$TARGET.tar.xz |
| 8 | 8 | TARGETDIR=$TARGET |
| @@ -21,9 +21,9 @@ TimeStart | ||
| 21 | 21 | |
| 22 | 22 | cd $TARGETDIR |
| 23 | 23 | |
| 24 | -echo Installing... | |
| 25 | -porg -lp $SCRIPT "make $SCRIPT" \ | |
| 26 | - 1> $LOG/$SCRIPT.1_install.log 2>&1 || exit 1 | |
| 24 | +Installing | |
| 25 | +porg -lp "$SCRIPT" "make $SCRIPT" \ | |
| 26 | + 1> $LOG/${SCRIPT}_1.install.log 2>&1 || (echo Error occured && exit 1) | |
| 27 | 27 | |
| 28 | 28 | TimeEnd |
| 29 | 29 |
| @@ -1,33 +0,0 @@ | ||
| 1 | -#!/bin/sh | |
| 2 | - | |
| 3 | -. ./_blfsset.sh | |
| 4 | - | |
| 5 | -TARGET=blfs-systemd-units-$S_BOOTSCRIPTDATE | |
| 6 | -SCRIPT=install-httpd | |
| 7 | -TARGETBALL=$DLD/$TARGET.tar.xz | |
| 8 | -TARGETDIR=$TARGET | |
| 9 | - | |
| 10 | -echo $SCRIPT | |
| 11 | - | |
| 12 | -. $WRK/_checkRequired.sh httpd | |
| 13 | -. $WRK/_checkTarball.sh | |
| 14 | -. $WRK/_checkExit.sh "$1" || exit $? | |
| 15 | - | |
| 16 | -cd $SRC | |
| 17 | -RemoveSrcDir | |
| 18 | -Extract | |
| 19 | - | |
| 20 | -TimeStart | |
| 21 | - | |
| 22 | -cd $TARGETDIR | |
| 23 | - | |
| 24 | -Installing | |
| 25 | -porg -lp "$SCRIPT" "make $SCRIPT" \ | |
| 26 | - 1> $LOG/${SCRIPT}_1.install.log 2>&1 || (echo Error occured && exit 1) | |
| 27 | - | |
| 28 | -TimeEnd | |
| 29 | - | |
| 30 | -cd .. | |
| 31 | -RemoveSrcDir | |
| 32 | -PorgingDone $SCRIPT | |
| 33 | - |
Fork