free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Tidying

This commit is contained in:
Bob Mottram 2018-05-07 18:29:24 +01:00
parent df942c46ce
commit bbc0bc9910
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/freedombone-image
View File

@ -536,7 +536,7 @@ fi
cp -r /etc/${PROJECT_NAME}/* $TEMPBUILD_DIR cp -r /etc/${PROJECT_NAME}/* $TEMPBUILD_DIR
rm -rf $TEMPBUILD_DIR/vendor rm -rf $TEMPBUILD_DIR/vendor
chown -R "$CURR_USER": $TEMPBUILD_DIR chown -R "$CURR_USER":"$CURR_USER" $TEMPBUILD_DIR
cd $TEMPBUILD_DIR || exit 24729847 cd $TEMPBUILD_DIR || exit 24729847
if [[ $MINIMAL_INSTALL == "yes" ]]; then if [[ $MINIMAL_INSTALL == "yes" ]]; then
@ -648,12 +648,12 @@ fi
for im in ${image_types[@]} for im in ${image_types[@]}
do do
# shellcheck disable=SC2012,SC2086 # shellcheck disable=SC2012,SC2086
no_of_files=$(ls -afq build/${PROJECT_NAME}*.${im} | wc -l) no_of_files=$(ls -l build/${PROJECT_NAME}*.${im} | wc -l)
if (( no_of_files > 0 )); then if [ "$no_of_files" -gt 0 ]; then
# shellcheck disable=SC2086 # shellcheck disable=SC2086
mv build/${PROJECT_NAME}*.${im} ${CURR_DIR}/ mv build/${PROJECT_NAME}*.${im} ${CURR_DIR}/
# shellcheck disable=SC2086 # shellcheck disable=SC2086
sudo chown "${CURR_USER}": ${CURR_DIR}/*.${im} sudo chown "${CURR_USER}":"${CURR_USER}" ${CURR_DIR}/*.${im}
fi fi
done done