From 22b1755411484c02b697df98d9e0a358db044625 Mon Sep 17 00:00:00 2001 From: emmett1 Date: Sat, 5 Aug 2017 17:28:53 +0800 Subject: [PATCH] updated --- functions | 10 +++++----- scratchpkg.conf | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/functions b/functions index c773bc7..d3991c0 100644 --- a/functions +++ b/functions @@ -145,11 +145,11 @@ loadconfigfile() { if [ -f $CONF_FILE ]; then . $CONF_FILE - PACKAGE_DIR=$(cat $CONF_FILE | grep ^'# PACKAGE_DIR' | tr -d '=' | tr -d '"' | cut -d ' ' -f 3-) - SOURCE_DIR=$(cat $CONF_FILE | grep ^'# SOURCE_DIR' | tr -d '=' | tr -d '"' | cut -d ' ' -f 3-) - WORK_DIR=$(cat $CONF_FILE | grep ^'# WORK_DIR' | tr -d '=' | tr -d '"' | cut -d ' ' -f 3-) - PORT_REPO=$(cat $CONF_FILE | grep ^'# PORT_REPO' | tr -d '=' | tr -d '"' | cut -d ' ' -f 3-) - PURGE_FILE=$(cat $CONF_FILE | grep ^'# PURGE_FILE' | tr -d '=' | tr -d '"' | cut -d ' ' -f 3-) + PACKAGE_DIR=$(cat $CONF_FILE | grep ^'#PACKAGE_DIR' | tr -d '=' | tr -d '"' | cut -d ' ' -f 2-) + SOURCE_DIR=$(cat $CONF_FILE | grep ^'#SOURCE_DIR' | tr -d '=' | tr -d '"' | cut -d ' ' -f 2-) + WORK_DIR=$(cat $CONF_FILE | grep ^'#WORK_DIR' | tr -d '=' | tr -d '"' | cut -d ' ' -f 2-) + PORT_REPO=$(cat $CONF_FILE | grep ^'#PORT_REPO' | tr -d '=' | tr -d '"' | cut -d ' ' -f 2-) + PURGE_FILE=$(cat $CONF_FILE | grep ^'#PURGE_FILE' | tr -d '=' | tr -d '"' | cut -d ' ' -f 2-) else msg "${color_red}Configuration file not found.${color_reset}" exit 1 diff --git a/scratchpkg.conf b/scratchpkg.conf index 9613cc3..ccc6768 100644 --- a/scratchpkg.conf +++ b/scratchpkg.conf @@ -2,15 +2,15 @@ export CFLAGS="-O2 -march=x86-64 -pipe" export CXXFLAGS="${CFLAGS}" -export MAKEFLAGS="-j6" +export MAKEFLAGS="-j2" -# PACKAGE_DIR = /var/spkg/packages -# SOURCE_DIR = /var/spkg/sources -# WORK_DIR = /tmp +#PACKAGE_DIR = /var/spkg/packages +#SOURCE_DIR = /var/spkg/sources +#WORK_DIR = /tmp -# PORT_REPO = /home/emmett/github/scratchpkgPorts/lfs-stable/base -# PORT_REPO = /home/emmett/github/scratchpkgPorts/lfs-stable/blfs -# PORT_REPO = /home/emmett/github/scratchpkgPorts/lfs-stable/xorg -# PORT_REPO = /home/emmett/github/scratchpkgPorts/extra +#PORT_REPO = /home/emmett/github/scratchpkgPorts/lfs-stable/base +#PORT_REPO = /home/emmett/github/scratchpkgPorts/lfs-stable/blfs +#PORT_REPO = /home/emmett/github/scratchpkgPorts/lfs-stable/xorg +#PORT_REPO = /home/emmett/github/scratchpkgPorts/extra -# PURGE_FILE = usr/share/locale +#PURGE_FILE = usr/share/locale