diff --git a/scripts/unpack b/scripts/unpack
index f75c973b7f..47452dc76c 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -58,44 +58,45 @@ printf "%${BUILD_INDENT}c ${boldcyan}UNPACK${endcolor}   $1\n" ' '>&$SILENT_OUT
 export BUILD_INDENT=$((${BUILD_INDENT:-1}+$BUILD_INDENT_SIZE))
 
 # unset functions
-  unset -f pre_unpack
-  unset -f unpack
-  unset -f post_unpack
-  unset -f pre_patch
-  unset -f post_patch
+unset -f pre_unpack
+unset -f unpack
+unset -f post_unpack
+unset -f pre_patch
+unset -f post_patch
 
-  . $PKG_DIR/package.mk
+. $PKG_DIR/package.mk
 
-  if [ "$(type -t pre_unpack)" = "function" ]; then
-    pre_unpack
-  fi
+if [ "$(type -t pre_unpack)" = "function" ]; then
+  pre_unpack
+fi
 
-  if [ "$(type -t unpack)" = "function" ]; then
-    unpack
-  else
-    if [ -n "$PKG_URL" ]; then
-      $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
-      $SCRIPTS/extract $1 "$1*.tbz"     $BUILD
-      $SCRIPTS/extract $1 "$1*.tar.gz"  $BUILD
-      $SCRIPTS/extract $1 "$1*.tar.xz"  $BUILD
-      $SCRIPTS/extract $1 "$1*.txz"     $BUILD
-      $SCRIPTS/extract $1 "$1*.tgz"     $BUILD
-      $SCRIPTS/extract $1 "$1*.7z"      $BUILD
-      $SCRIPTS/extract $1 "$1*.zip"     $BUILD
-    fi
+if [ "$(type -t unpack)" = "function" ]; then
+  unpack
+else
+  if [ -n "$PKG_URL" ]; then
+    $SCRIPTS/extract $1 "$1*.tar.bz2" $BUILD
+    $SCRIPTS/extract $1 "$1*.tbz"     $BUILD
+    $SCRIPTS/extract $1 "$1*.tar.gz"  $BUILD
+    $SCRIPTS/extract $1 "$1*.tar.xz"  $BUILD
+    $SCRIPTS/extract $1 "$1*.txz"     $BUILD
+    $SCRIPTS/extract $1 "$1*.tgz"     $BUILD
+    $SCRIPTS/extract $1 "$1*.7z"      $BUILD
+    $SCRIPTS/extract $1 "$1*.zip"     $BUILD
   fi
+fi
 
-  if [ -n "$PKG_SOURCE_DIR" ]; then
-    mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
-  fi
+if [ -n "$PKG_SOURCE_DIR" ]; then
+  mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
+fi
 
-  if [ -d "$PKG_DIR/sources" ]; then
-    [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
-    cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
-  fi
-  if [ "$(type -t post_unpack)" = "function" ]; then
-    post_unpack
-  fi
+if [ -d "$PKG_DIR/sources" ]; then
+  [ ! -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ] && mkdir -p $BUILD/${PKG_NAME}-${PKG_VERSION}
+  cp -PRf $PKG_DIR/sources/* $BUILD/${PKG_NAME}-${PKG_VERSION}
+fi
+
+if [ "$(type -t post_unpack)" = "function" ]; then
+  post_unpack
+fi
 
 if [ "$(type -t pre_patch)" = "function" ]; then
   pre_patch