Sfoglia il codice sorgente

Remove goupx, which is no longer required

See: https://github.com/pwaller/goupx/tree/1d58e01d5ce273bab8815ed4ded378a948956b81#update-20160310
Rod Hynes 3 anni fa
parent
commit
985bd448f0
2 ha cambiato i file con 4 aggiunte e 7 eliminazioni
  1. 0 3
      ConsoleClient/Dockerfile
  2. 4 4
      ConsoleClient/make.bash

+ 0 - 3
ConsoleClient/Dockerfile

@@ -29,7 +29,4 @@ RUN curl -L https://storage.googleapis.com/golang/$GOVERSION.linux-amd64.tar.gz
    && rm /tmp/go.tar.gz \
    && echo $GOVERSION > $GOROOT/VERSION
 
-# Get external Go dependencies.
-RUN go get github.com/pwaller/goupx
-
 WORKDIR $GOPATH/src/github.com/Psiphon-Labs/psiphon-tunnel-core/ConsoleClient

+ 4 - 4
ConsoleClient/make.bash

@@ -95,10 +95,10 @@ build_for_linux () {
   unset RETVAL
 
   echo "....UPX packaging output"
-  goupx --best bin/linux/${EXE_BASENAME}-i686
+  upx --best bin/linux/${EXE_BASENAME}-i686
   RETVAL=$?
   if [ $RETVAL != 0 ]; then
-    echo ".....goupx failed, exiting"
+    echo ".....upx failed, exiting"
     exit $RETVAL
   fi
   unset RETVAL
@@ -113,10 +113,10 @@ build_for_linux () {
   unset RETVAL
 
   echo "....UPX packaging output"
-  goupx --best bin/linux/${EXE_BASENAME}-x86_64
+  upx --best bin/linux/${EXE_BASENAME}-x86_64
   RETVAL=$?
   if [ $RETVAL != 0 ]; then
-    echo ".....goupx failed, exiting"
+    echo ".....upx failed, exiting"
     exit $RETVAL
   fi
   unset RETVAL