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

Consistent function style

This commit is contained in:
Bob Mottram 2018-03-08 11:13:07 +00:00
parent d1dce3d3d7
commit bbf1b9461d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/freedombone-image-customise
View File

@ -1007,7 +1007,7 @@ initialise_mesh() {
# User interface for USB drive installs ###################################### # User interface for USB drive installs ######################################
function mesh_client_startup_applications { mesh_client_startup_applications() {
if [ ! -d "$rootdir/home/$MY_USERNAME/Desktop" ]; then if [ ! -d "$rootdir/home/$MY_USERNAME/Desktop" ]; then
mkdir -p "$rootdir/home/$MY_USERNAME/Desktop" mkdir -p "$rootdir/home/$MY_USERNAME/Desktop"
fi fi
@ -1086,7 +1086,7 @@ function mesh_client_startup_applications {
chmod +x "$START_DESKTOP2" chmod +x "$START_DESKTOP2"
} }
function mesh_desktop_icons { mesh_desktop_icons() {
if [ ! -d "$rootdir/home/$MY_USERNAME/Desktop" ]; then if [ ! -d "$rootdir/home/$MY_USERNAME/Desktop" ]; then
mkdir -p "$rootdir/home/$MY_USERNAME/Desktop" mkdir -p "$rootdir/home/$MY_USERNAME/Desktop"
fi fi
@ -1104,7 +1104,7 @@ function mesh_desktop_icons {
chroot "$rootdir" /bin/chown -R "$MY_USERNAME":"$MY_USERNAME" "/home/$MY_USERNAME/Desktop" chroot "$rootdir" /bin/chown -R "$MY_USERNAME":"$MY_USERNAME" "/home/$MY_USERNAME/Desktop"
} }
function configure_user_interface { configure_user_interface() {
if [[ "$VARIANT" != "meshclient" && "$VARIANT" != "meshusb" && "$VARIANT" != "usb" ]]; then if [[ "$VARIANT" != "meshclient" && "$VARIANT" != "meshusb" && "$VARIANT" != "usb" ]]; then
return return
fi fi
@ -1642,7 +1642,7 @@ EOF
# setup_utils # setup_utils
############################################################################## ##############################################################################
function image_install_inadyn { image_install_inadyn() {
if [ "$INSTALLING_MESH" ]; then if [ "$INSTALLING_MESH" ]; then
return return
fi fi
@ -1705,7 +1705,7 @@ function image_install_inadyn {
echo "inadyn commit:$INADYN_COMMIT" >> "$rootdir/root/freedombone-completed.txt" echo "inadyn commit:$INADYN_COMMIT" >> "$rootdir/root/freedombone-completed.txt"
} }
function image_setup_utils { image_setup_utils() {
if [ "$INSTALLING_MESH" ]; then if [ "$INSTALLING_MESH" ]; then
return return
fi fi
@ -1893,12 +1893,12 @@ function image_setup_utils {
#sed -i 's|btrfs subvol=@|btrfs defaults,subvol=@,compress=lzo,ssd|g' $rootdir/etc/fstab #sed -i 's|btrfs subvol=@|btrfs defaults,subvol=@,compress=lzo,ssd|g' $rootdir/etc/fstab
} }
function image_install_nodejs { image_install_nodejs() {
mesh_install_nodejs mesh_install_nodejs
#echo 'install_nodejs' >> ${rootdir}/root/${PROJECT_NAME}-completed.txt #echo 'install_nodejs' >> ${rootdir}/root/${PROJECT_NAME}-completed.txt
} }
function image_preinstall_repos { image_preinstall_repos() {
if [[ "$VARIANT" == "mesh"* ]]; then if [[ "$VARIANT" == "mesh"* ]]; then
return return
fi fi