zeroday0619/MahiroOS-jhalfs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove the need to have write access to BUILDDIR, using sudi, which is

Browse source 
required anyway. ticket #1715
This commit is contained in:
Pierre Labastie 2018-02-03 16:37:32 +00:00
parent f1edc8e377
commit c7b535b488
3 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
common/libs/func_install_blfs
View file

@ -7,7 +7,10 @@ install_blfs_tools() { # the scriptlets to build
#----------------------------# the dependency tools #----------------------------# the dependency tools
set -e set -e
# Install the files # Install the files
[[ ! -d ${BUILDDIR}${BLFS_ROOT} ]] && mkdir -pv ${BUILDDIR}${BLFS_ROOT} [[ ! -d ${BUILDDIR}${BLFS_ROOT} ]] && {
sudo mkdir -pv ${BUILDDIR}${BLFS_ROOT}
sudo chown $USER:$USER ${BUILDDIR}${BLFS_ROOT}
}
cp -r BLFS/* ${BUILDDIR}${BLFS_ROOT} cp -r BLFS/* ${BUILDDIR}${BLFS_ROOT}
cp -r menu ${BUILDDIR}${BLFS_ROOT} cp -r menu ${BUILDDIR}${BLFS_ROOT}
cp $COMMON_DIR/progress_bar.sh ${BUILDDIR}${BLFS_ROOT} cp $COMMON_DIR/progress_bar.sh ${BUILDDIR}${BLFS_ROOT}

2
common/libs/func_validate_configs.sh
View file

@ -177,7 +177,7 @@ inline_doc
# warning -z+ -w+ # warning -z+ -w+
SRC_ARCHIVE) [[ "$GETPKG" = "y" ]] && validate_dir -z+ -d -w+ ;; SRC_ARCHIVE) [[ "$GETPKG" = "y" ]] && validate_dir -z+ -d -w+ ;;
# The build directory/partition MUST exist and be writable by the user # The build directory/partition MUST exist and be writable by the user
BUILDDIR) validate_dir -z -d -w BUILDDIR) validate_dir -z -d
[[ "xx x/x" =~ x${!config_param}x ]] && write_error_and_die ;; [[ "xx x/x" =~ x${!config_param}x ]] && write_error_and_die ;;
LHOME) validate_dir -z -d ;; LHOME) validate_dir -z -d ;;

6
jhalfs
View file

@ -358,12 +358,14 @@ if [[ "$REBUILD_MAKEFILE" = "n" ]] ; then
clean_builddir clean_builddir
if [[ ! -d $JHALFSDIR ]]; then if [[ ! -d $JHALFSDIR ]]; then
mkdir -p $JHALFSDIR sudo mkdir -p $JHALFSDIR
sudo chown $USER:$USER $JHALFSDIR
fi fi
# Create $BUILDDIR/sources even though it could be created by get_sources() # Create $BUILDDIR/sources even though it could be created by get_sources()
if [[ ! -d $BUILDDIR/sources ]]; then if [[ ! -d $BUILDDIR/sources ]]; then
mkdir -p $BUILDDIR/sources sudo mkdir -p $BUILDDIR/sources
sudo chmod a+wt $BUILDDIR/sources
fi fi
# Create the log directory # Create the log directory