epm play k3s: small fixes

pack.d/k3s.sh

@@ -10,7 +10,7 @@ PKGNAME=$PRODUCT-$VERSION
 
 install -D $TAR usr/bin/$PRODUCT || fatal
 for i in kubectl crictl ctr k3s ; do
-    ln -s $PRODUCT usr/bin/$i
+    ln -sf $PRODUCT usr/bin/$i
 done
 erc pack $PKGNAME.tar usr/bin
 

play.d/k3s.sh

@@ -32,5 +32,5 @@ else
     PKGURL="https://github.com/k3s-io/k3s/releases/download/v$VERSION+k3s1/$file"
 fi
 
-VERSION="$(echo "$PKGURL" | sed -e 's|.*download/v||' -e 's|%2Bk3s1.*||' -e 's|-.*||')"
+VERSION="$(echo "$PKGURL" | sed -e 's|.*download/v||' -e 's|%2Bk3s1.*||' -e 's|+k3s1.*||' -e 's|-.*||')"
 epm pack --install $PKGNAME "$PKGURL" $VERSION

repack.d/k3s.sh

@@ -12,6 +12,8 @@ subst "s|^URL:.*|URL: https://k3s.io|" $SPEC
 subst "s|^Summary:.*|Summary: K3s - Lightweight Kubernetes|" $SPEC
 
 subst '1iConflicts: kubernetes-client' $SPEC
+# /usr/bin/ctr
+subst '1iConflicts: containerd' $SPEC
 
 # Check https://get.k3s.io/