From 28f0289dc9f545ea27eda5f1561ac27acafeab89 Mon Sep 17 00:00:00 2001 From: MilhouseVH Date: Thu, 1 Feb 2018 05:21:36 +0000 Subject: [PATCH] samba: use helper function --- packages/network/samba/package.mk | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/packages/network/samba/package.mk b/packages/network/samba/package.mk index 5739605939..96e2b89cfc 100644 --- a/packages/network/samba/package.mk +++ b/packages/network/samba/package.mk @@ -143,17 +143,11 @@ post_makeinstall_target() { mkdir -p $INSTALL/usr/lib/samba cp $PKG_DIR/scripts/samba-config $INSTALL/usr/lib/samba - mkdir -p $INSTALL/etc/samba - if [ -n "$DEVICE" -a -f $PROJECT_DIR/$PROJECT/devices/$DEVICE/config/smb.conf ]; then - cp $PROJECT_DIR/$PROJECT/devices/$DEVICE/config/smb.conf $INSTALL/etc/samba - elif [ -f $PROJECT_DIR/$PROJECT/config/smb.conf ]; then - cp $PROJECT_DIR/$PROJECT/config/smb.conf $INSTALL/etc/samba - elif [ -f $DISTRO_DIR/$DISTRO/config/smb.conf ]; then - cp $DISTRO_DIR/$DISTRO/config/smb.conf $INSTALL/etc/samba - else - cp $PKG_DIR/config/smb.conf $INSTALL/etc/samba + if find_file_path config/smb.conf; then + mkdir -p $INSTALL/etc/samba + cp ${FOUND_PATH} $INSTALL/etc/samba mkdir -p $INSTALL/usr/config - cp $PKG_DIR/config/smb.conf $INSTALL/usr/config/samba.conf.sample + cp $INSTALL/etc/samba/smb.conf $INSTALL/usr/config/samba.conf.sample fi if [ "$DEVTOOLS" = "yes" ]; then