PKGBUILD improvements

2 files changed, 146 insertions, 148 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 16176f9b2b12..9faeba2ac826 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,9 +6,9 @@ pkgbase = mullvad-vpn-beta
 	install = mullvad-vpn.install
 	arch = x86_64
 	license = GPL3
+	makedepends = cargo
 	makedepends = git
 	makedepends = go
-	makedepends = rust
 	makedepends = nodejs>=12
 	makedepends = npm>=6.12
 	makedepends = nvm
diff --git a/PKGBUILD b/PKGBUILD
index 85d268614cd4..0ac2d4baa433 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -14,7 +14,7 @@ url="https://www.mullvad.net"
 arch=('x86_64')
 license=('GPL3')
 depends=('iputils' 'libnotify' 'libappindicator-gtk3' 'nss')
-makedepends=('git' 'go' 'rust' 'nodejs>=12' 'npm>=6.12' 'nvm')
+makedepends=('cargo' 'git' 'go' 'nodejs>=12' 'npm>=6.12' 'nvm')
 provides=("${pkgname%-beta}")
 conflicts=("${pkgname%-beta}")
 install="${pkgname%-beta}.install"
@@ -36,163 +36,161 @@ validpgpkeys=('EA0A77BF9E115615FC3BD8BC7653B940E494FE87'
               # David Lönnhager (code signing) <david.l@mullvad.net>
 
 _ensure_local_nvm() {
-	# lets be sure we are starting clean
-	which nvm >/dev/null 2>&1 && nvm deactivate && nvm unload
-	export NVM_DIR="$srcdir/.nvm"
-
-	# The init script returns 3 if version
-	# specified in ./.nvrc is not (yet) installed in $NVM_DIR
-	# but nvm itself still gets loaded ok
-	source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
+  # let's be sure we are starting clean
+  which nvm >/dev/null 2>&1 && nvm deactivate && nvm unload
+  export NVM_DIR="$srcdir/.nvm"
+
+  # The init script returns 3 if version specified
+  # in ./.nvrc is not (yet) installed in $NVM_DIR
+  # but nvm itself still gets loaded ok
+  source /usr/share/nvm/init-nvm.sh || [[ $? != 1 ]]
 }
 
 prepare() {
-	cd "$srcdir/mullvadvpn-app"
-	git submodule init dist-assets/binaries
-	git config submodule.mullvadvpn-app-binaries.url "$srcdir/mullvadvpn-app-binaries"
-	git submodule update
-
-	# Disable building of rpm
-	sed -i "s/'deb', 'rpm'/'deb'/g" gui/tasks/distribution.js
-
-	echo "Removing old Rust build artifacts"
-	cargo clean --target-dir=target
-
-	# Prevent creation of a `go` directory in one's home.
-	# Sometimes this directory cannot be removed with even `rm -rf` unless
-	# one becomes root or changes the write permissions.
-	export GOPATH="$srcdir/gopath"
-	go clean -modcache
-
-	# Build fails with Node.js 16, use 15
-	export npm_config_cache="$srcdir/npm-cache"
-	local npm_prefix=$(npm config get prefix)
-	local nodeversion='15.14.0'
-	npm config delete prefix
-	_ensure_local_nvm
-	nvm install "$nodeversion" && nvm use "$nodeversion"
+  cd "$srcdir/mullvadvpn-app"
+  git submodule init dist-assets/binaries
+  git config submodule.mullvadvpn-app-binaries.url "$srcdir/mullvadvpn-app-binaries"
+  git submodule update
+
+  # Disable building of rpm
+  sed -i "s/'deb', 'rpm'/'deb'/g" gui/tasks/distribution.js
+
+  echo "Removing old Rust build artifacts"
+  cargo clean
+
+  cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
+
+  # Prevent creation of a `go` directory in one's home.
+  # Sometimes this directory cannot be removed with even `rm -rf` unless
+  # one becomes root or changes the write permissions.
+  export GOPATH="$srcdir/gopath"
+  go clean -modcache
+
+  # Build fails with Node.js 16, use 15
+  export npm_config_cache="$srcdir/npm-cache"
+  _ensure_local_nvm
+  nvm install 15.14.0
 }
 
 build() {
-	cd "$srcdir/mullvadvpn-app"
-	local RUSTC_VERSION=$(rustc --version)
-	local PRODUCT_VERSION=$(node -p "require('./gui/package.json').version" | \
-		sed -Ee 's/\.0//g')
-	source env.sh ""
-
-	echo "Building Mullvad VPN $PRODUCT_VERSION..."
-
-	echo "Updating version in metadata files..."
-	./version-metadata.sh inject $PRODUCT_VERSION --desktop
-
-	echo "Building wireguard-go..."
-	pushd wireguard/libwg
-	mkdir -p "../../build/lib/$CARCH-unknown-linux-gnu"
-	export GOPATH="$srcdir/gopath"
-	export CGO_CPPFLAGS="${CPPFLAGS}"
-	export CGO_CFLAGS="${CFLAGS}"
-	export CGO_CXXFLAGS="${CXXFLAGS}"
-	export CGO_LDFLAGS="${LDFLAGS}"
-	export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
-	go build -v -o "../../build/lib/$CARCH-unknown-linux-gnu"/libwg.a -buildmode c-archive
-	popd
-
-	# Clean mod cache for makepkg -C
-	go clean -modcache
-
-	export MULLVAD_ADD_MANIFEST="1"
-
-	echo "Building Rust code in release mode using $RUSTC_VERSION..."
-
-	cargo build --release --locked --target-dir=target
-
-	mkdir -p dist-assets/shell-completions
-	for sh in bash zsh fish; do
-		echo "Generating shell completion script for $sh..."
-		cargo run --bin mullvad --release --locked --target-dir=target -- shell-completions "$sh" \
-			dist-assets/shell-completions/
-	done
-
-	echo "Copying binaries"
-	binaries=(
-		mullvad-daemon
-		mullvad
-		mullvad-problem-report
-		libtalpid_openvpn_plugin.so
-		mullvad-setup
-		mullvad-exclude
-	)
-	for binary in ${binaries[*]}; do
-		cp "target/release/$binary" "dist-assets/$binary"
-	done
-
-	echo "Updating relay list..."
-	cargo run --bin relay_list --release --target-dir=target > dist-assets/relays.json
-
-	echo "Updating API address cache..."
-	cargo run --bin address_cache --release --target-dir=target > dist-assets/api-ip-address.txt
-
-	# Build Electron GUI app
-	pushd gui
-	_ensure_local_nvm
-	echo "Installing JavaScript dependencies..."
-	npm ci --cache "$srcdir/npm-cache"
-	echo "Packing final release artifact..."
-	npm run pack:linux
-	popd
-
-	# Restore node config from nvm
-	npm config set prefix "$npm_prefix"
-	nvm unalias default
+  cd "$srcdir/mullvadvpn-app"
+  local RUSTC_VERSION=$(rustc --version)
+  local PRODUCT_VERSION=$(node -p "require('./gui/package.json').version" | \
+    sed -Ee 's/\.0//g')
+  source env.sh ""
+
+  echo "Building Mullvad VPN $PRODUCT_VERSION..."
+
+  echo "Updating version in metadata files..."
+  ./version-metadata.sh inject $PRODUCT_VERSION --desktop
+
+  echo "Building wireguard-go..."
+  pushd wireguard/libwg
+  mkdir -p "../../build/lib/$CARCH-unknown-linux-gnu"
+  export GOPATH="$srcdir/gopath"
+  export CGO_CPPFLAGS="${CPPFLAGS}"
+  export CGO_CFLAGS="${CFLAGS}"
+  export CGO_CXXFLAGS="${CXXFLAGS}"
+  export CGO_LDFLAGS="${LDFLAGS}"
+  export GOFLAGS="-buildmode=pie -trimpath -ldflags=-linkmode=external -mod=readonly -modcacherw"
+  go build -v -o "../../build/lib/$CARCH-unknown-linux-gnu"/libwg.a -buildmode c-archive
+  popd
+
+  # Clean mod cache for makepkg -C
+  go clean -modcache
+
+  export MULLVAD_ADD_MANIFEST="1"
+
+  echo "Building Rust code in release mode using $RUSTC_VERSION..."
+
+  export RUSTUP_TOOLCHAIN=stable
+  export CARGO_TARGET_DIR=target
+  cargo build --frozen --release
+
+  mkdir -p dist-assets/shell-completions
+  for sh in bash zsh fish; do
+    echo "Generating shell completion script for $sh..."
+    cargo run --bin mullvad --frozen --release -- shell-completions "$sh" \
+      dist-assets/shell-completions/
+  done
+
+  echo "Copying binaries"
+  binaries=(
+    mullvad-daemon
+    mullvad
+    mullvad-problem-report
+    libtalpid_openvpn_plugin.so
+    mullvad-setup
+    mullvad-exclude
+  )
+  for binary in ${binaries[*]}; do
+    cp "target/release/$binary" "dist-assets/$binary"
+  done
+
+  echo "Updating relay list..."
+  cargo run --bin relay_list --frozen --release > dist-assets/relays.json
+
+  echo "Updating API address cache..."
+  cargo run --bin address_cache --frozen --release > dist-assets/api-ip-address.txt
+
+  # Build Electron GUI app
+  pushd gui
+  _ensure_local_nvm
+  echo "Installing JavaScript dependencies..."
+  npm ci --cache "$srcdir/npm-cache"
+  echo "Packing final release artifact..."
+  npm run pack:linux
+  popd
 }
 
 #check() {
-#	cd "$srcdir/mullvadvpn-app"
-#	cargo test --release --locked --target-dir=target
+#  cd "$srcdir/mullvadvpn-app"
+#  export RUSTUP_TOOLCHAIN=stable
+#  cargo test --frozen
 #
-#	cd gui
-#	npm test
+#  cd gui
+#  npm test
 #}
 
 package() {
-	cd "$srcdir/mullvadvpn-app"
-
-	# Install main files
-	install -d "$pkgdir/opt/Mullvad VPN"
-	cp -r dist/linux-unpacked/* "$pkgdir/opt/Mullvad VPN"
-
-	# Symlink daemon service to correct directory
-	install -d "$pkgdir/usr/lib/systemd/system"
-	ln -s "/opt/Mullvad VPN/resources/mullvad-daemon.service" \
-		"$pkgdir/usr/lib/systemd/system"
-
-	# Install binaries
-	install -Dm755 dist-assets/{mullvad,mullvad-exclude} -t "$pkgdir/usr/bin"
-
-	# Link to the problem report binary
-	ln -s "/opt/Mullvad VPN/resources/mullvad-problem-report" \
-		"$pkgdir/usr/bin/mullvad-problem-report"
-
-	# Link to the GUI binary
-	install -m755 "$srcdir/${pkgname%-beta}.sh" "$pkgdir/usr/bin/${pkgname%-beta}"
-
-	# Install completions
-	install -Dm755 dist-assets/shell-completions/mullvad.bash \
-		"$pkgdir/usr/share/bash-completion/completions/mullvad"
-	install -Dm755 dist-assets/shell-completions/_mullvad -t \
-		"$pkgdir/usr/share/zsh/site-functions"
-	install -Dm755 dist-assets/shell-completions/mullvad.fish -t \
-		"$pkgdir/usr/share/fish/vendor_completions.d"
-
-	# Install desktop file & icons from deb
-	cd dist
-	ar x *.deb
-	bsdtar -xf data.tar.xz
-	install -Dm644 "usr/share/applications/${pkgname%-beta}.desktop" -t \
-		"$pkgdir/usr/share/applications"
-
-	for icon_size in 16 32 48 64 128 256 512 1024; do
-		icons_dir=usr/share/icons/hicolor/${icon_size}x${icon_size}/apps
-		install -Dm644 $icons_dir/${pkgname%-beta}.png -t $pkgdir/$icons_dir
-	done
+  cd "$srcdir/mullvadvpn-app"
+
+  # Install main files
+  install -d "$pkgdir/opt/Mullvad VPN"
+  cp -r dist/linux-unpacked/* "$pkgdir/opt/Mullvad VPN"
+
+  # Symlink daemon service to correct directory
+  install -d "$pkgdir/usr/lib/systemd/system"
+  ln -s "/opt/Mullvad VPN/resources/mullvad-daemon.service" \
+    "$pkgdir/usr/lib/systemd/system"
+
+  # Install binaries
+  install -Dm755 dist-assets/{mullvad,mullvad-exclude} -t "$pkgdir/usr/bin"
+
+  # Link to the problem report binary
+  ln -s "/opt/Mullvad VPN/resources/mullvad-problem-report" \
+    "$pkgdir/usr/bin/mullvad-problem-report"
+
+  # Link to the GUI binary
+  install -m755 "$srcdir/${pkgname%-beta}.sh" "$pkgdir/usr/bin/${pkgname%-beta}"
+
+  # Install completions
+  install -Dm755 dist-assets/shell-completions/mullvad.bash \
+    "$pkgdir/usr/share/bash-completion/completions/mullvad"
+  install -Dm755 dist-assets/shell-completions/_mullvad -t \
+    "$pkgdir/usr/share/zsh/site-functions"
+  install -Dm755 dist-assets/shell-completions/mullvad.fish -t \
+    "$pkgdir/usr/share/fish/vendor_completions.d"
+
+  # Install desktop file & icons from deb
+  cd dist
+  ar x *.deb
+  bsdtar -xf data.tar.xz
+  install -Dm644 "usr/share/applications/${pkgname%-beta}.desktop" -t \
+    "$pkgdir/usr/share/applications"
+
+  for icon_size in 16 32 48 64 128 256 512 1024; do
+    icons_dir=usr/share/icons/hicolor/${icon_size}x${icon_size}/apps
+    install -Dm644 $icons_dir/${pkgname%-beta}.png -t $pkgdir/$icons_dir
+  done
 }