build: fix build script issue.

package/build-pkg.sh

@@ -53,9 +53,9 @@ showhelp()
 
 init_env()
 {
-    if [ -z "$CC" ]; then
-        CC=gcc
-    fi
+	if [ -z "$CC" ]; then
+		CC=gcc
+	fi
 
 	MAKE_NJOBS=$(grep processor /proc/cpuinfo  | wc -l 2>/dev/null || echo 1)
 	export MAKE_NJOBS
@@ -70,13 +70,13 @@ init_env()
 		SMARTDNS_WITH_LIBS=1
 	fi
 
-    check_cc="`echo "$CC" | grep -E "(\-gcc|\-cc)"`"
-    if [ ! -z "$check_cc" ]; then
-        TARGET_ARCH="`$CC -dumpmachine`"
-        echo "target arch: $TARGET_ARCH"
-    fi
+	check_cc="`echo "$CC" | grep -E "(\-gcc|\-cc)"`"
+	if [ ! -z "$check_cc" ]; then
+		TARGET_ARCH="`$CC -dumpmachine`"
+		echo "target arch: $TARGET_ARCH"
+	fi
 
-    if [ $SMARTDNS_WITH_LIBS -eq 1 ]; then
+	if [ $SMARTDNS_WITH_LIBS -eq 1 ]; then
 		case "$TARGET_ARCH" in
 			*arm*)
 				NEED_UPDATE_ARM_CP15=1
@@ -103,89 +103,89 @@ copy_smartdns_libs()
 {
 	SMARTDNS_BIN="$CODE_DIR/src/smartdns"
 
-    copy_libs_recursive $SMARTDNS_BIN
-    if [ $? -ne 0 ]; then
-        echo "copy libs failed"
-        return 1
-    fi
-
-    LIB_WEBUI_SO="$CODE_DIR/plugin/smartdns-ui/target/smartdns_ui.so"
-    copy_libs_recursive $LIB_WEBUI_SO
-    if [ $? -ne 0 ]; then
-        echo "copy libs failed"
-        return 1
-    fi
+	copy_libs_recursive $SMARTDNS_BIN
+	if [ $? -ne 0 ]; then
+		echo "copy libs failed"
+		return 1
+	fi
+
+	LIB_WEBUI_SO="$CODE_DIR/plugin/smartdns-ui/target/smartdns_ui.so"
+	copy_libs_recursive $LIB_WEBUI_SO
+	if [ $? -ne 0 ]; then
+		echo "copy libs failed"
+		return 1
+	fi
 }
 
 copy_libs_recursive()
 {
-    local lib=$1
-    local lib_path=`$CC -print-file-name=$lib`
-    if [ -z "$lib_path" ]; then
-        return 0
-    fi
-
-    if [ -e $SMARTDNS_STATIC_DIR/lib/$lib ]; then
-        return 0
-    fi
-
-    local tmp_path="`echo "$lib_path" | grep "libc.so"`"
-    if [ ! -z "$tmp_path" ]; then
-        LIBC_PATH="$tmp_path"
-    fi
-
-    if [ "$lib" != "$SMARTDNS_BIN" ]; then
-        echo "copy $lib_path to $SMARTDNS_STATIC_DIR/lib"
-        cp $lib_path $SMARTDNS_STATIC_DIR/lib
-        if [ $? -ne 0 ]; then
-            echo "copy $lib failed"
-            return 1
-        fi
-    fi
-
-    local shared_libs="`objdump -p $lib_path | grep NEEDED | awk '{print $2}'`"
-    for sub_lib in $shared_libs; do
-        copy_libs_recursive $sub_lib
-        if [ $? -ne 0 ]; then
-            return 1
-        fi
-    done
-
-    return 0
+	local lib=$1
+	local lib_path=`$CC -print-file-name=$lib`
+	if [ -z "$lib_path" ]; then
+		return 0
+	fi
+
+	if [ -e $SMARTDNS_STATIC_DIR/lib/$lib ]; then
+		return 0
+	fi
+
+	local tmp_path="`echo "$lib_path" | grep "libc.so"`"
+	if [ ! -z "$tmp_path" ]; then
+		LIBC_PATH="$tmp_path"
+	fi
+
+	if [ "$lib" != "$SMARTDNS_BIN" ]; then
+		echo "copy $lib_path to $SMARTDNS_STATIC_DIR/lib"
+		cp $lib_path $SMARTDNS_STATIC_DIR/lib
+		if [ $? -ne 0 ]; then
+			echo "copy $lib failed"
+			return 1
+		fi
+	fi
+
+	local shared_libs="`objdump -p $lib_path | grep NEEDED | awk '{print $2}'`"
+	for sub_lib in $shared_libs; do
+		copy_libs_recursive $sub_lib
+		if [ $? -ne 0 ]; then
+			return 1
+		fi
+	done
+
+	return 0
 }
 
 copy_linker()
 {
-    LINK_PATH=`$CC -print-file-name=$LINKER_NAME`
-    SYM_LINKER_NAME=`readlink -f $LINK_PATH`
-
-    echo "linker: $LINK_PATH"
-    echo "sym linker: $SYM_LINKER_NAME"
-    echo "libc: $LIBC_PATH"
-
-    if [ "$SYM_LINKER_NAME" = "$LIBC_PATH" ]; then
-        ln -f -s $(basename $LIBC_PATH) $SMARTDNS_STATIC_DIR/lib/$(basename $LINKER_NAME)
-    else
-        cp $LINK_PATH $SMARTDNS_STATIC_DIR/lib -af
-        if [ $? -ne 0 ]; then
-            echo "copy $lib failed"
-            return 1
-        fi
-
-        SYM_LINKER_NAME=`readlink $SMARTDNS_STATIC_DIR/lib/$LINKER_NAME`
-        if [ ! -e $SMARTDNS_STATIC_DIR/lib/$SYM_LINKER_NAME ]; then
-            SYM_LINKER_NAME=`basename $SYM_LINKER_NAME`
-            ln -f -s $SYM_LINKER_NAME $SMARTDNS_STATIC_DIR/lib/$LINKER_NAME
-        fi
-    fi
-
-    ln -f -s ${LINKER_NAME} ${SMARTDNS_STATIC_DIR}/lib/ld-linux.so
-    if [ $? -ne 0 ]; then
-        echo "copy $lib failed"
-        return 1
-    fi
-
-    return 0
+	LINK_PATH=`$CC -print-file-name=$LINKER_NAME`
+	SYM_LINKER_NAME=`readlink -f $LINK_PATH`
+
+	echo "linker: $LINK_PATH"
+	echo "sym linker: $SYM_LINKER_NAME"
+	echo "libc: $LIBC_PATH"
+
+	if [ "$SYM_LINKER_NAME" = "$LIBC_PATH" ]; then
+		ln -f -s $(basename $LIBC_PATH) $SMARTDNS_STATIC_DIR/lib/$(basename $LINKER_NAME)
+	else
+		cp $LINK_PATH $SMARTDNS_STATIC_DIR/lib -af
+		if [ $? -ne 0 ]; then
+			echo "copy $lib failed"
+			return 1
+		fi
+
+		SYM_LINKER_NAME=`readlink $SMARTDNS_STATIC_DIR/lib/$LINKER_NAME`
+		if [ ! -e $SMARTDNS_STATIC_DIR/lib/$SYM_LINKER_NAME ]; then
+			SYM_LINKER_NAME=`basename $SYM_LINKER_NAME`
+			ln -f -s $SYM_LINKER_NAME $SMARTDNS_STATIC_DIR/lib/$LINKER_NAME
+		fi
+	fi
+
+	ln -f -s ${LINKER_NAME} ${SMARTDNS_STATIC_DIR}/lib/ld-linux.so
+	if [ $? -ne 0 ]; then
+		echo "copy $lib failed"
+		return 1
+	fi
+
+	return 0
 }
 
 build_smartdns()
@@ -238,12 +238,12 @@ build_smartdns()
 	cp $CURR_DIR/run-smartdns $SMARTDNS_STATIC_DIR
 	chmod +x $SMARTDNS_STATIC_DIR/run-smartdns
 	if [ "$NEED_UPDATE_ARM_CP15" = "1" ]; then
-        sed -i 's/NEED_CHECK_ARM_CP15=0/NEED_CHECK_ARM_CP15=1/' $SMARTDNS_STATIC_DIR/run-smartdns
-        if [ $? -ne 0 ]; then
-            echo "sed run-smartdns failed"
-            return 1
-        fi
-    fi
+		sed -i 's/NEED_CHECK_ARM_CP15=0/NEED_CHECK_ARM_CP15=1/' $SMARTDNS_STATIC_DIR/run-smartdns
+		if [ $? -ne 0 ]; then
+			echo "sed run-smartdns failed"
+			return 1
+		fi
+	fi
 
 	copy_smartdns_libs
 	if [ $? -ne 0 ]; then
@@ -253,10 +253,10 @@ build_smartdns()
 	rm $SMARTDNS_STATIC_DIR/lib/smartdns_ui.so >/dev/null 2>&1
 
 	copy_linker
-    if [ $? -ne 0 ]; then
-        echo "copy linker failed"
-        return 1
-    fi
+	if [ $? -ne 0 ]; then
+		echo "copy linker failed"
+		return 1
+	fi
 
 	return 0
 }

package/copy-smartdns.sh

@@ -6,57 +6,57 @@ CODE_DIR="$CURR_DIR/.."
 SMARTDNS_STATIC_DIR="$WORKDIR/smartdns-static"
 
 main() {
-    TARGET_DIR=$1
-    PREFIX=$2
-    if [ -z "$TARGET_DIR" ]; then
-        echo "Usage: $0 <target_directory> [prefix_directory]"
-        exit 1
-    fi
-
-    if [ ! -d "$TARGET_DIR" ]; then
-        echo "Target directory $TARGET_DIR does not exist."
-        exit 1
-    fi
-
-
-    if [ ! -f "$SMARTDNS_STATIC_DIR/smartdns" ]; then
-        cp "$CODE_DIR/src/smartdns" "$TARGET_DIR$PREFIX/usr/sbin/smartdns"
-        if [ $? -ne 0 ]; then
-            echo "Failed to copy smartdns binary to $TARGET_DIR/usr/sbin."
-            return 1
-        fi
-
-        chmod +x "$TARGET_DIR/usr/sbin/smartdns"
-
-        return 0
-    fi
-
-    if [ ! -f "$SMARTDNS_STATIC_DIR/smartdns" ]; then
-        echo "SmartDNS binary not found in $SMARTDNS_STATIC_DIR."
-        return 1
-    fi
-
-    mkdir -p "$TARGET_DIR/usr/local/lib/smartdns"
-    if [ $? -ne 0 ]; then
-        echo "Failed to create directory $TARGET_DIR/usr/local/lib/smartdns."
-        return 1
-    fi
-
-    cp $SMARTDNS_STATIC_DIR/* $TARGET_DIR/usr/local/lib/smartdns/ -a
-    if [ $? -ne 0 ]; then
-        echo "Failed to copy smartdns static files to $TARGET_DIR/usr/local/lib/smartdns."
-        return 1
-    fi
-
-    ln -f -s "$PREFIX/usr/local/lib/smartdns/run-smartdns" "$TARGET_DIR/usr/sbin/smartdns"
-    if [ $? -ne 0 ]; then
-        echo "Failed to create symlink for smartdns in $TARGET_DIR/usr/sbin."
-        return 1
-    fi
-    chmod +x "$TARGET_DIR/usr/local/lib/smartdns/run-smartdns"
-
-    echo "SmartDNS files copied successfully to $TARGET_DIR."
-    return 0
+	TARGET_DIR=$1
+	PREFIX=$2
+	if [ -z "$TARGET_DIR" ]; then
+		echo "Usage: $0 <target_directory> [prefix_directory]"
+		exit 1
+	fi
+
+	if [ ! -d "$TARGET_DIR" ]; then
+		echo "Target directory $TARGET_DIR does not exist."
+		exit 1
+	fi
+
+
+	if [ ! -f "$SMARTDNS_STATIC_DIR/smartdns" ]; then
+		cp "$CODE_DIR/src/smartdns" "$TARGET_DIR$PREFIX/usr/sbin/smartdns"
+		if [ $? -ne 0 ]; then
+			echo "Failed to copy smartdns binary to $TARGET_DIR$PREFIX/usr/sbin."
+			return 1
+		fi
+
+		chmod +x "$TARGET_DIR$PREFIX/usr/sbin/smartdns"
+
+		return 0
+	fi
+
+	if [ ! -f "$SMARTDNS_STATIC_DIR/smartdns" ]; then
+		echo "SmartDNS binary not found in $SMARTDNS_STATIC_DIR."
+		return 1
+	fi
+
+	mkdir -p "$TARGET_DIR$PREFIX/usr/local/lib/smartdns"
+	if [ $? -ne 0 ]; then
+		echo "Failed to create directory $TARGET_DIR$PREFIX/usr/local/lib/smartdns."
+		return 1
+	fi
+
+	cp $SMARTDNS_STATIC_DIR/* $TARGET_DIR$PREFIX/usr/local/lib/smartdns/ -a
+	if [ $? -ne 0 ]; then
+		echo "Failed to copy smartdns static files to $TARGET_DIR$PREFIX/usr/local/lib/smartdns."
+		return 1
+	fi
+
+	ln -f -s "$PREFIX/usr/local/lib/smartdns/run-smartdns" "$TARGET_DIR$PREFIX/usr/sbin/smartdns"
+	if [ $? -ne 0 ]; then
+		echo "Failed to create symlink for smartdns in $TARGET_DIR$PREFIX/usr/sbin."
+		return 1
+	fi
+	chmod +x "$TARGET_DIR$PREFIX/usr/local/lib/smartdns/run-smartdns"
+
+	echo "SmartDNS files copied successfully to $TARGET_DIR$PREFIX."
+	return 0
 }
 
 main $@

package/optware/make.sh

@@ -49,17 +49,12 @@ build()
 	cp $SMARTDNS_CONF  $ROOT/opt/etc/smartdns/
 	cp $SMARTDNS_OPT $ROOT/opt/etc/smartdns/
 	cp $CURR_DIR/S50smartdns $ROOT/opt/etc/init.d/
-	$SMARTDNS_CP $ROOT/opt /opt
+	$SMARTDNS_CP $ROOT /opt
 	if [ $? -ne 0 ]; then
 		echo "copy smartdns file failed."
 		rm -fr $PKG_ROOT
 		return 1
 	fi
-	if [ $? -ne 0 ]; then
-		echo "copy smartdns file failed."
-		rm -fr $ROOT/
-		return 1
-	fi
 
 	if [ $IS_BUILD_SMARTDNS_UI -ne 0 ]; then
 		mkdir $ROOT/opt/usr/lib/smartdns -p