ipinfo · abu-usama · Jan 26, 2024 · Jan 11, 2024 · Jan 11, 2024 · Jan 11, 2024
diff --git a/.github/workflows/cd_gemfury.yaml b/.github/workflows/cd_gemfury.yaml
@@ -0,0 +1,55 @@
+# Build and release ipinfo cli to gemfury (apt)
+
+name: Release to Gemfury
+on:
+  push:
+    tags:
+      - 'ipinfo-*'
+
+jobs:
+  release:
+    name: Release
+    runs-on: ubuntu-latest
+    steps:
+    - name: Checkout
+      uses: actions/checkout@v3
+
+    - name: Setup GO
+      uses: actions/setup-go@v3
+      with:
+        go-version: '1.20'
+
+    - name: Extract CLI Name and Version
+      run: |
+        # Get the tag name from the event payload
+        TAG_NAME=${{ github.ref_name }}
+
+        # Use a regular expression to extract the CLI name and version
+        if [[ $TAG_NAME =~ ^([^-]+)-([^-]+)$ ]]; then
+          CLI_NAME="${BASH_REMATCH[1]}"
+          CLI_VERSION="${BASH_REMATCH[2]}"
+
+          echo "CLI Name: $CLI_NAME"
+          echo "CLI Version: $CLI_VERSION"
+
+          # Add to github env
+          echo "CLI_NAME=$CLI_NAME" >> $GITHUB_ENV
+          echo "CLI_VERSION=$CLI_VERSION" >> $GITHUB_ENV
+        else
+          echo "Invalid tag format: $TAG_NAME"
+          echo "Tag should be of format CLI-VSN. e.g. ipinfo-1.0.0"
+          exit 1
+        fi
+
+    - name: Build
+      run: ./scripts/build-archive-all.sh ${{ env.CLI_NAME }} ${{ env.CLI_VERSION }} true
+
+    - name: Install dependencies
+      run: |
+        echo "deb [trusted=yes] https://apt.fury.io/cli/ * *" | sudo tee /etc/apt/sources.list.d/fury-cli.list
+        sudo apt-get update
+        sudo apt-get install -y fury-cli
+
+    - name: Upload
+      run: |
+        fury push ./build/${{ env.CLI_NAME }}_${{ env.CLI_VERSION }}_linux_*.deb --api-token  ${{ secrets.IPINFO_GEMFURY_PUSH_TOKEN }}
diff --git a/.github/workflows/cd_ppa.yaml b/.github/workflows/cd_ppa.yaml
diff --git a/README.md b/README.md
@@ -32,12 +32,12 @@ curl -Ls https://github.com/ipinfo/cli/releases/download/ipinfo-3.3.0/macos.sh |
 _Note_: this installs our full suite of binaries and keeps them up-to-date.
 
 ```bash
-sudo add-apt-repository ppa:ipinfo/ppa
+echo "deb [trusted=yes] https://ppa.ipinfo.net/ /" | sudo tee  "/etc/apt/sources.list.d/ipinfo.ppa.list"
 sudo apt update
 sudo apt install ipinfo
 ```
 
-### Debian / Ubuntu (amd64)
+### Debian / Ubuntu
 
 _Note_: this is a one-time installation; updates are not automatic. Use the PPA
 for automatic updates.
@@ -49,10 +49,12 @@ curl -Ls https://github.com/ipinfo/cli/releases/download/ipinfo-3.3.0/deb.sh | s
 OR
 
 ```bash
-curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-3.3.0/ipinfo_3.3.0.deb
-sudo dpkg -i ipinfo_3.3.0.deb
+curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-3.3.0/ipinfo_3.3.0_linux_{arch}.deb
+sudo dpkg -i ipinfo_3.3.0_linux_{arch}.deb
 ```
 
+where `{arch}` can be 386, amd64, arm, or arm64.
+
 ### FreeBSD
 
 ```bash
@@ -147,7 +149,7 @@ curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-3.3.0/ipinfo_3.3
 wget https://github.com/ipinfo/cli/releases/download/ipinfo-3.3.0/ipinfo_3.3.0_${PLAT}.tar.gz
 
 tar -xvf ipinfo_3.3.0_${PLAT}.tar.gz
-mv ipinfo_3.3.0_${PLAT} /usr/local/bin/ipinfo
+sudo mv ipinfo_3.3.0_${PLAT} /usr/local/bin/ipinfo
 ```
 
 ### Using `git`

diff --git a/cidr2ip/deb.sh b/cidr2ip/deb.sh
@@ -1,10 +1,30 @@
 #!/bin/sh
 
 VSN=1.0.0
+DEFAULT_ARCH=amd64
 
-curl -LO https://github.com/ipinfo/cli/releases/download/cidr2ip-${VSN}/cidr2ip_${VSN}.deb
-sudo dpkg -i cidr2ip_${VSN}.deb
-rm cidr2ip_${VSN}.deb
+ARCH=$(uname -m)
+case $ARCH in
+    x86_64)
+        ARCH_NAME="amd64"
+        ;;
+    i386|i686)
+        ARCH_NAME="386"
+        ;;
+    aarch64)
+        ARCH_NAME="arm64"
+        ;;
+    armv7l)
+        ARCH_NAME="arm"
+        ;;
+    *)
+        ARCH_NAME=$DEFAULT_ARCH
+        ;;
+esac
+
+curl -LO https://github.com/ipinfo/cli/releases/download/cidr2ip-${VSN}/cidr2ip_${VSN}_linux_${ARCH_NAME}.deb
+sudo dpkg -i cidr2ip_${VSN}_linux_${ARCH_NAME}.deb
+rm cidr2ip_${VSN}_linux_${ARCH_NAME}.deb
 
 echo
 echo 'You can now run `cidr2ip`'.

diff --git a/cidr2range/deb.sh b/cidr2range/deb.sh
@@ -1,10 +1,29 @@
 #!/bin/sh
 
 VSN=1.2.0
+DEFAULT_ARCH=amd64
 
-curl -LO https://github.com/ipinfo/cli/releases/download/cidr2range-${VSN}/cidr2range_${VSN}.deb
-sudo dpkg -i cidr2range_${VSN}.deb
-rm cidr2range_${VSN}.deb
+ARCH=$(uname -m)
+case $ARCH in
+    x86_64)
+        ARCH_NAME="amd64"
+        ;;
+    i386|i686)
+        ARCH_NAME="386"
+        ;;
+    aarch64)
+        ARCH_NAME="arm64"
+        ;;
+    armv7l)
+        ARCH_NAME="arm"
+        ;;
+    *)
+        ARCH_NAME=$DEFAULT_ARCH
+        ;;
+esac
+curl -LO https://github.com/ipinfo/cli/releases/download/cidr2range-${VSN}/cidr2range_${VSN}_linux_${ARCH_NAME}.deb
+sudo dpkg -i cidr2range_${VSN}_linux_${ARCH_NAME}.deb
+rm cidr2range_${VSN}_linux_${ARCH_NAME}.deb
 
 echo
 echo 'You can now run `cidr2range`'.

diff --git a/debian/changelog b/debian/changelog
diff --git a/debian/control b/debian/control
diff --git a/debian/copyright b/debian/copyright
diff --git a/debian/files b/debian/files
diff --git a/debian/rules b/debian/rules
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
diff --git a/debian/watch b/debian/watch
diff --git a/grepdomain/deb.sh b/grepdomain/deb.sh
@@ -1,10 +1,29 @@
 #!/bin/sh
 
 VSN=1.0.0
+DEFAULT_ARCH=amd64
 
-curl -LO https://github.com/ipinfo/cli/releases/download/grepdomain-${VSN}/grepdomain_${VSN}.deb
-sudo dpkg -i grepdomain_${VSN}.deb
-rm grepdomain_${VSN}.deb
+ARCH=$(uname -m)
+case $ARCH in
+    x86_64)
+        ARCH_NAME="amd64"
+        ;;
+    i386|i686)
+        ARCH_NAME="386"
+        ;;
+    aarch64)
+        ARCH_NAME="arm64"
+        ;;
+    armv7l)
+        ARCH_NAME="arm"
+        ;;
+    *)
+        ARCH_NAME=$DEFAULT_ARCH
+        ;;
+esac
+curl -LO https://github.com/ipinfo/cli/releases/download/grepdomain-${VSN}/grepdomain_${VSN}_linux_${ARCH_NAME}.deb
+sudo dpkg -i grepdomain_${VSN}_linux_${ARCH_NAME}.deb
+rm grepdomain_${VSN}_linux_${ARCH_NAME}.deb
 
 echo
 echo 'You can now run `grepdomain`'.

diff --git a/grepip/deb.sh b/grepip/deb.sh
@@ -1,10 +1,29 @@
 #!/bin/sh
 
 VSN=1.2.3
+DEFAULT_ARCH=amd64
 
-curl -LO https://github.com/ipinfo/cli/releases/download/grepip-${VSN}/grepip_${VSN}.deb
-sudo dpkg -i grepip_${VSN}.deb
-rm grepip_${VSN}.deb
+ARCH=$(uname -m)
+case $ARCH in
+    x86_64)
+        ARCH_NAME="amd64"
+        ;;
+    i386|i686)
+        ARCH_NAME="386"
+        ;;
+    aarch64)
+        ARCH_NAME="arm64"
+        ;;
+    armv7l)
+        ARCH_NAME="arm"
+        ;;
+    *)
+        ARCH_NAME=$DEFAULT_ARCH
+        ;;
+esac
+curl -LO https://github.com/ipinfo/cli/releases/download/grepip-${VSN}/grepip_${VSN}_linux_${ARCH_NAME}.deb
+sudo dpkg -i grepip_${VSN}_linux_${ARCH_NAME}.deb
+rm grepip_${VSN}_linux_${ARCH_NAME}.deb
 
 echo
 echo 'You can now run `grepip`'.

diff --git a/ipinfo/build-all-platforms.sh b/ipinfo/build-all-platforms.sh
@@ -1,12 +1,14 @@
 #!/bin/bash
 
 # Build binary for all platforms for version $1.
+# Optional param LINUX_ONLY can be set to `true`, to build for linux only.
 
 set -e
 
 DIR=`dirname $0`
 ROOT=$DIR/..
 
 VSN=$1
+LINUX_ONLY=$2
 
-$ROOT/scripts/build-all-platforms.sh "ipinfo" $VSN
+$ROOT/scripts/build-all-platforms.sh "ipinfo" $VSN $LINUX_ONLY
diff --git a/ipinfo/deb.sh b/ipinfo/deb.sh
@@ -1,10 +1,30 @@
 #!/bin/sh
 
 VSN=3.3.0
+DEFAULT_ARCH=amd64
 
-curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-${VSN}/ipinfo_${VSN}.deb
-sudo dpkg -i ipinfo_${VSN}.deb
-rm ipinfo_${VSN}.deb
+ARCH=$(uname -m)
+case $ARCH in
+    x86_64)
+        ARCH_NAME="amd64"
+        ;;
+    i386|i686)
+        ARCH_NAME="386"
+        ;;
+    aarch64)
+        ARCH_NAME="arm64"
+        ;;
+    armv7l)
+        ARCH_NAME="arm"
+        ;;
+    *)
+        ARCH_NAME=$DEFAULT_ARCH
+        ;;
+esac
+
+curl -LO https://github.com/ipinfo/cli/releases/download/ipinfo-${VSN}/ipinfo_${VSN}_linux_${ARCH_NAME}.deb
+sudo dpkg -i ipinfo_${VSN}_linux_${ARCH_NAME}.deb
+rm ipinfo_${VSN}_linux_${ARCH_NAME}.deb
 
 echo
 echo 'You can now run `ipinfo`'.