Install vcpkg root at /opt/vcpkg and add a vcpkg system group with GID 499

5 files changed, 36 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5ef048eeca43..b9af4e502cca 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = vcpkg-git
 	pkgdesc = C++ library manager for Windows, Linux, and MacOS
-	pkgver = 2021.05.12.r575.g6b24f0fa76
+	pkgver = 2021.05.12.r1018.g973a7d517c
 	pkgrel = 1
 	url = https://github.com/microsoft/vcpkg
 	install = vcpkg-git.install
@@ -16,9 +16,9 @@ pkgbase = vcpkg-git
 	conflicts = vcpkg
 	source = vcpkg-git::git+https://github.com/microsoft/vcpkg
 	source = vcpkg.sh
-	source = vcpkg-git.install
+	source = vcpkg.conf
 	sha256sums = SKIP
-	sha256sums = 8571fc5d24e62f448647a7d41ae2f3b64bce4ef0f51596f94b3ea92c3d2d2899
-	sha256sums = 928a5845d87a61bc0126d6ee860c832bb739e0d5f8a0d45641bfb76851076d1b
+	sha256sums = a26b2b4472e3e7c3372617ada9ca2d4c33094c5c5004880e0f3b32bcf5086a25
+	sha256sums = 02a6d2bca471adedfc7acc9ba57860d976ec5115b282cb1a96341850e1c7b221
 
 pkgname = vcpkg-git
diff --git a/PKGBUILD b/PKGBUILD
index f6a597b7e740..6daca2060828 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Kuan-Yen Chou <kuanyenchou at gmail dot com>
 
 pkgname=vcpkg-git
-pkgver=2021.05.12.r575.g6b24f0fa76
+pkgver=2021.05.12.r1018.g973a7d517c
 pkgrel=1
 pkgdesc='C++ library manager for Windows, Linux, and MacOS'
 depends=('curl' 'zip' 'unzip')
@@ -16,11 +16,11 @@ provides=('vcpkg')
 conflicts=('vcpkg')
 source=("$pkgname"::'git+https://github.com/microsoft/vcpkg'
         'vcpkg.sh'
-        'vcpkg-git.install')
+        'vcpkg.conf')
 sha256sums=('SKIP'
-            '8571fc5d24e62f448647a7d41ae2f3b64bce4ef0f51596f94b3ea92c3d2d2899'
-            '928a5845d87a61bc0126d6ee860c832bb739e0d5f8a0d45641bfb76851076d1b')
-install=${pkgname}.install
+            'a26b2b4472e3e7c3372617ada9ca2d4c33094c5c5004880e0f3b32bcf5086a25'
+            '02a6d2bca471adedfc7acc9ba57860d976ec5115b282cb1a96341850e1c7b221')
+install=$pkgname.install
 
 pkgver() {
     cd "$srcdir/$pkgname"
@@ -36,20 +36,29 @@ build() {
 }
 
 package() {
+    export VCPKG_ROOT=/opt/vcpkg
+    export VCPKG_DOWNLOADS=/var/cache/vcpkg
+
     # executable entry point
     install -Dm755 "$srcdir/vcpkg.sh" "$pkgdir/usr/bin/vcpkg"
 
     # vcpkg root
-    install -Dm755 "$srcdir/$pkgname/vcpkg" "$pkgdir/usr/share/vcpkg/vcpkg"
+    install -Dm755 "$srcdir/$pkgname/vcpkg" "$pkgdir/$VCPKG_ROOT/vcpkg"
     cp --preserve=mode -r \
         "$srcdir/$pkgname"/{docs,ports,scripts,triplets,.vcpkg-root} \
-        "$pkgdir/usr/share/vcpkg/"
+        "$pkgdir/$VCPKG_ROOT/"
 
     # default downloads root directory
-    install -dm1777 "$pkgdir/var/cache/vcpkg"
+    install -dm1777 "$pkgdir/$VCPKG_DOWNLOADS"
+
+    # reset ownerships and permissions
+    chmod -R g+w "$pkgdir/$VCPKG_ROOT"
+    chgrp -hR 499 "$pkgdir/$VCPKG_ROOT" "$pkgdir/$VCPKG_DOWNLOADS"
 
     # license
     install -Dm644 "$srcdir/$pkgname/LICENSE.txt" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+    # systemd-sysusers.service
+    install -Dm644 "$srcdir/vcpkg.conf" "$pkgdir/usr/lib/sysusers.d/vcpkg.conf"
 }
 
 # vim: set sw=4 ts=4 et:
diff --git a/vcpkg-git.install b/vcpkg-git.install
index a45793492c61..de5153c57be2 100644
--- a/vcpkg-git.install
+++ b/vcpkg-git.install
@@ -1,12 +1,17 @@
 post_install() {
-  
+  export VCPKG_ROOT=/opt/vcpkg
+  export VCPKG_DOWNLOADS=/var/cache/vcpkg
+
   cat << _EOF
 
   ==> vcpkg user note:
   ------------------------------------------------------------------------------
-    "VCPKG_ROOT" is set to "/usr/share/vcpkg"
-    "VCPKG_DOWNLOADS" is set to "/var/cache/vcpkg"
-    To cooperate with CMake, add "-DCMAKE_TOOLCHAIN_FILE=/usr/share/vcpkg/scripts/buildsystems/vcpkg.cmake"
+    "VCPKG_ROOT" is set to "$VCPKG_ROOT"
+    "VCPKG_DOWNLOADS" is set to "$VCPKG_DOWNLOADS"
+    To cooperate with CMake, add "-DCMAKE_TOOLCHAIN_FILE=$VCPKG_ROOT/scripts/buildsystems/vcpkg.cmake"
+
+    Please add the intended users to the group 'vcpkg':
+    # gpasswd -a <user> vcpkg
 
 _EOF
 }
diff --git a/vcpkg.conf b/vcpkg.conf
new file mode 100644
index 000000000000..08e7573776a9
--- /dev/null
+++ b/vcpkg.conf
@@ -0,0 +1,5 @@
+#
+# vcpkg system group
+#
+# type  name  ID    [GECOS  home    shell]
+g vcpkg 499
diff --git a/vcpkg.sh b/vcpkg.sh
index 02dfb1d92f27..82fc6958ba59 100755
--- a/vcpkg.sh
+++ b/vcpkg.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-export VCPKG_ROOT=/usr/share/vcpkg
+export VCPKG_ROOT=/opt/vcpkg
 export VCPKG_DOWNLOADS=/var/cache/vcpkg
 
 $VCPKG_ROOT/vcpkg "$@"