diff --git a/debian-show-version.sh b/debian-version.sh
similarity index 100%
rename from debian-show-version.sh
rename to debian-version.sh
diff --git a/geth-install.sh b/geth-install.sh
index be85103..2cfcad1 100644
--- a/geth-install.sh
+++ b/geth-install.sh
@@ -15,18 +15,22 @@ else
   fi
 fi
 
-# 用 dpkg --print-architecture 更直接
-ARCH=`dpkg --print-architecture`
-# if [[ "$(uname -m)" = "aarch64" ]];
-# then
-#   ARCH=arm64
-# elif [[ "$(uname -m)" = "armv7l" ]];
-# then
-#   ARCH=arm
-# elif [[ "$(uname -m)" = "x86_64" ]];
-# then
-#   ARCH=amd64
-# fi
+if [[ "$(uname)" = "linux" ]]
+then
+  # 用 dpkg --print-architecture 更直接
+  ARCH=`dpkg --print-architecture`
+else
+  if [[ "$(uname -m)" = "aarch64" ]];
+  then
+    ARCH=arm64
+  elif [[ "$(uname -m)" = "armv7l" ]];
+  then
+    ARCH=arm
+  elif [[ "$(uname -m)" = "x86_64" ]];
+  then
+    ARCH=amd64
+  fi
+fi
 
 OS=`uname | tr 'A-Z' 'a-z'`
 
@@ -34,15 +38,13 @@ echo "=== Install geth：[b] for 二进制， [s] for 源代码，[anything else
 read -p ">>> " BINARY_OR_SOURCE
 if [ "$BINARY_OR_SOURCE" == 'b' ]
 then
-  echo "--- 下载二进制 geth (https://geth.ethereum.org/downloads) with correct hash"
-  read -p ">>> " DOWNLINK
-  # wget https://gethstore.blob.core.windows.net/builds/geth-$OS-$ARCH-$VERSION-$HASH.tar.gz -O geth-$OS-$ARCH-$VERSION.tgz
-  wget $DOWNLINK -O geth-$OS-$ARCH-$VERSION.tgz
-  tar xzf ./geth-$OS-$ARCH-$VERSION.tgz # --strip-components 1 ## 去掉tar包中顶级目录，因为顶级目录含有checksum，不方便在下一步进入
+  echo "--- Extracting download link with correct hash from https://geth.ethereum.org/downloads"
+  wget https://gethstore.blob.core.windows.net/builds/`curl -s -L -o - 'https://geth.ethereum.org/downloads' | grep -o -m 1 "geth-$OS-$ARCH-$VERSION-[0-9a-f]*.tar.gz" | head -n 1` -O geth-binary-temp.tgz
+  tar xzf ./geth-binary-temp.tgz # --strip-components 1 ## 去掉tar包中顶级目录，因为顶级目录含有checksum，不方便在下一步进入
   echo "--- 安装到 /usr/local/bin/geth"
-  mv ./geth-$OS-$ARCH-$VERSION-*/geth /usr/local/bin/
+  mv ./geth-$OS-$ARCH-*/geth /usr/local/bin/
   echo "--- 删除原始文件"
-  rm -fr ./geth-$OS-$ARCH-$VERSION.tgz ./geth-$OS-$ARCH-$VERSION-*/
+  rm -fr ./geth-binary-temp.tgz ./geth-$OS-$ARCH-*/
 elif [ "$BINARY_OR_SOURCE" == 's' ]
 then
   echo "--- 克隆并编译 geth"
diff --git a/ipfs-install.sh b/ipfs-install.sh
index 8dc2dfb..8f3f677 100755
--- a/ipfs-install.sh
+++ b/ipfs-install.sh
@@ -14,18 +14,22 @@ else
   fi
 fi
 
-# 用 dpkg --print-architecture 更直接
-ARCH=`dpkg --print-architecture`
-# if [[ "$(uname -m)" = "aarch64" ]];
-# then
-#   ARCH=arm64
-# elif [[ "$(uname -m)" = "armv7l" ]];
-# then
-#   ARCH=arm
-# elif [[ "$(uname -m)" = "x86_64" ]];
-# then
-#   ARCH=amd64
-# fi
+if [[ "$(uname)" = "linux" ]]
+then
+  # 用 dpkg --print-architecture 更直接
+  ARCH=`dpkg --print-architecture`
+else
+  if [[ "$(uname -m)" = "aarch64" ]];
+  then
+    ARCH=arm64
+  elif [[ "$(uname -m)" = "armv7l" ]];
+  then
+    ARCH=arm
+  elif [[ "$(uname -m)" = "x86_64" ]];
+  then
+    ARCH=amd64
+  fi
+fi
 
 OS=`uname | tr 'A-Z' 'a-z'`