]> gitweb.fluxo.info Git - stowpkg.git/commitdiff
Misc updates
authorSilvio Rhatto <rhatto@riseup.net>
Mon, 18 Sep 2017 19:12:20 +0000 (16:12 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Mon, 18 Sep 2017 19:12:20 +0000 (16:12 -0300)
README.md
kvmxfile
ports/net/luakit/env
stowpkg
tests/provision [new file with mode: 0755]

index 6f90340c4eab02c037fb978a26af9ebddfc2a643..538975fabe367d278c856c13dc3559d1f16527d4 100644 (file)
--- a/README.md
+++ b/README.md
@@ -15,13 +15,22 @@ Features
 Coming features
 ---------------
 
-* Automatic patch application.
+* Automatic application patching.
 * Source code verification using multiple methods (commit hash, checksums, OpenPGP).
 
 Installation
 ------------
 
-On a Debian-like system:
+Simply clone it and add to your `$PATH`:
+
+    git clone https://git.fluxo.info/stowpkg
+
+You can also verify the latest commit's OpenPGP signature:
+
+    /usr/bin/git -C stowpkg verify-commit HEAD
+
+You'll also need some dependencies. On a Debian-like system those can be
+installed using
 
     sudo apt install stow build-essential
 
@@ -77,12 +86,12 @@ Starting from `$BASE` (like `/usr/local`) we have:
 Further development
 -------------------
 
-Per-architecture binary package support using git-annex and GnuPG signatures, including:
+Per-architecture binary package support using git-annex and GnuPG signatures, including:
 
     stowpkg pack  <package> # pack an installed package
     stowpkg fetch <package> # fetch package from the repo
 
-What is does
+What it does
 ------------
 
 If you want to do it manually:
index a435cdf613e34772f2c8ff0c8dc10c620a13b1d9..3a03db62cc85278eccc739ff00dba985d7c9a1a4 100644 (file)
--- a/kvmxfile
+++ b/kvmxfile
@@ -22,7 +22,7 @@ shared_folder_mountpoint="/home/$user/code/$VM"
 #provision_rsync_opts="--exclude=somefolder"
 
 # Absolute path for a provision script located inside the guest.
-provision_command="/usr/local/share/kvmx/provision/development"
+provision_command="/home/$user/code/$VM/tests/provision"
 
 # Graphics
 # See https://wiki.archlinux.org/index.php/QEMU#Graphics
index e0f8ae744690ca699be5055f4d3f291071d55a10..f21df649a7adf0a70fbd9bde0a73c66d32a7218a 100644 (file)
@@ -1,4 +1,5 @@
-version="master"
+#version="master"
+version="71eb86317b13f8d72282517874ed25a44318d16e"
 source_format="git"
 url="https://github.com/luakit/luakit"
 dependencies_stowpkg=""
diff --git a/stowpkg b/stowpkg
index a0feecd52e9686f36da300e58b01738f06b06ddc..8ddc166c1fcbea71bcacce87e95486949656868e 100755 (executable)
--- a/stowpkg
+++ b/stowpkg
@@ -160,6 +160,11 @@ stowpkg_install () {
 
   cd ${package}-${version}
 
+  if [ "$source_format" = "git" ]; then
+    git fetch --all
+    git checkout version
+  fi
+
   # Build
   if [ -e "$location/rules" ]; then
     . $location/rules
diff --git a/tests/provision b/tests/provision
new file mode 100755 (executable)
index 0000000..d96965d
--- /dev/null
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+# Run the default development provisioner
+/usr/local/share/kvmx/provision/development
+
+# Configure a test enviroment
+echo 'BASE="/home/user/temp/misc/stowpkg"' > /home/user/.config/stowpkg