Skip to content
This repository was archived by the owner on May 28, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dockermachine.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ func RunSSHCommand(machineName, command string, verbose bool) (out []byte, err e
if verbose {
fmt.Println(`docker-machine ssh ` + machineName + ` '` + command + `'`)
}
return exec.Command("/bin/sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
return exec.Command("sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
}

func GetSSHPort(machineName string) (port uint, err error) {
out, err := exec.Command("/bin/sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
out, err := exec.Command("sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
if err != nil {
return 0, err
}
Expand Down
2 changes: 2 additions & 0 deletions main.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
166 changes: 166 additions & 0 deletions main_windows.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
// +build windows

package main

import (
"flag"
"fmt"
"gopkg.in/fsnotify.v1"
"log"
"os"
pathpkg "path"
"strings"
)

func main() {
pwd, err := os.Getwd()
if err != nil {
fmt.Println("error: unable to get current directory:", err)
os.Exit(1)
}

flag.Usage = func() {
fmt.Fprintf(os.Stderr, "usage: %v [options] DOCKER-MACHINE-NAME\n", os.Args[0])
fmt.Fprintf(os.Stderr, " or: %v [options] rsync://IP:PORT/MODULE\n", os.Args[0])
fmt.Print("\nOptions:\n")
flag.PrintDefaults()
}

var version = flag.Bool("version", false, "Print version")
var watch = flag.Bool("watch", true, "Watch source directory for changes")
var verbose = flag.Bool("verbose", false, "Verbose output")
var srcpath = flag.String("src", pwd, "Source directory")
var dstpath = flag.String("dst", pathpkg.Join("/rsync", pwd), "Destination directory")

flag.Parse()

if *version {
fmt.Println(Version)
os.Exit(0)
}

if len(flag.Args()) != 1 {
flag.Usage()
os.Exit(1)
}

via := flag.Args()[0]

if *srcpath == "" {
fmt.Println("error: please specify -src argument")
os.Exit(1)
}

if *dstpath == "" {
fmt.Println("error: please specify -dst argument")
os.Exit(1)
}

rpath := *srcpath
rpathDir := pathpkg.Dir(*dstpath)

// TODO: refactor the following part...

if strings.HasPrefix(via, "rsync://") {
// use rsync protocol directly
rsyncEndpoint := via

fmt.Printf("Syncing %s (local) to %s (%s)\n", *srcpath, *dstpath, rsyncEndpoint)
Sync(rsyncEndpoint, 0, rpath, rpathDir, *verbose) // initial sync

if *watch {
fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

} else {
// use rsync via ssh
machineName := via

port, err := GetSSHPort(machineName)
if err != nil {
fmt.Printf("error: unable to get port for machine '%v': %v\n", machineName, err)
os.Exit(1)
}

Provision(machineName, *verbose)
RunSSHCommand(machineName, "sudo mkdir -p "+rpathDir, *verbose)
fmt.Printf("Syncing %s (local) to %s (docker-machine %s)\n", *srcpath, *dstpath, machineName)
Sync(machineName, port, rpath, rpathDir, *verbose) // initial sync

if *watch {

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This if statement is the only differing part. I also was not pleased to duplicate whole main.go - Maybe there could be a small wrapper around the actual (darwin) watch.go, which imitates fsnotify.v1 signature?

fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(machineName, port, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

}

}
4 changes: 2 additions & 2 deletions rsync.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@ func Sync(via string, port uint, src, dst string, verbose bool) {

command := "rsync " + strings.Join(args, " ")

// fmt.Println("/bin/sh", "-c", command)
cmd := exec.Command("/bin/sh", "-c", command)
// fmt.Println("sh", "-c", command)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this dependency on sh? Or replace it by a corresponding multiplattfrom go library?

cmd := exec.Command("sh", "-c", command)

if verbose {
cmd.Stdout = os.Stdout
Expand Down
2 changes: 2 additions & 0 deletions watch.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
WIP (windows support): stub for supporting windows via fsnotify.v1 by blaggacao · Pull Request #6 · synack/docker-rsync · GitHub
Skip to content
This repository was archived by the owner on May 28, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dockermachine.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ func RunSSHCommand(machineName, command string, verbose bool) (out []byte, err e
if verbose {
fmt.Println(`docker-machine ssh ` + machineName + ` '` + command + `'`)
}
return exec.Command("/bin/sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
return exec.Command("sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
}

func GetSSHPort(machineName string) (port uint, err error) {
out, err := exec.Command("/bin/sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
out, err := exec.Command("sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
if err != nil {
return 0, err
}
Expand Down
2 changes: 2 additions & 0 deletions main.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
166 changes: 166 additions & 0 deletions main_windows.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
// +build windows

package main

import (
"flag"
"fmt"
"gopkg.in/fsnotify.v1"
"log"
"os"
pathpkg "path"
"strings"
)

func main() {
pwd, err := os.Getwd()
if err != nil {
fmt.Println("error: unable to get current directory:", err)
os.Exit(1)
}

flag.Usage = func() {
fmt.Fprintf(os.Stderr, "usage: %v [options] DOCKER-MACHINE-NAME\n", os.Args[0])
fmt.Fprintf(os.Stderr, " or: %v [options] rsync://IP:PORT/MODULE\n", os.Args[0])
fmt.Print("\nOptions:\n")
flag.PrintDefaults()
}

var version = flag.Bool("version", false, "Print version")
var watch = flag.Bool("watch", true, "Watch source directory for changes")
var verbose = flag.Bool("verbose", false, "Verbose output")
var srcpath = flag.String("src", pwd, "Source directory")
var dstpath = flag.String("dst", pathpkg.Join("/rsync", pwd), "Destination directory")

flag.Parse()

if *version {
fmt.Println(Version)
os.Exit(0)
}

if len(flag.Args()) != 1 {
flag.Usage()
os.Exit(1)
}

via := flag.Args()[0]

if *srcpath == "" {
fmt.Println("error: please specify -src argument")
os.Exit(1)
}

if *dstpath == "" {
fmt.Println("error: please specify -dst argument")
os.Exit(1)
}

rpath := *srcpath
rpathDir := pathpkg.Dir(*dstpath)

// TODO: refactor the following part...

if strings.HasPrefix(via, "rsync://") {
// use rsync protocol directly
rsyncEndpoint := via

fmt.Printf("Syncing %s (local) to %s (%s)\n", *srcpath, *dstpath, rsyncEndpoint)
Sync(rsyncEndpoint, 0, rpath, rpathDir, *verbose) // initial sync

if *watch {
fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

} else {
// use rsync via ssh
machineName := via

port, err := GetSSHPort(machineName)
if err != nil {
fmt.Printf("error: unable to get port for machine '%v': %v\n", machineName, err)
os.Exit(1)
}

Provision(machineName, *verbose)
RunSSHCommand(machineName, "sudo mkdir -p "+rpathDir, *verbose)
fmt.Printf("Syncing %s (local) to %s (docker-machine %s)\n", *srcpath, *dstpath, machineName)
Sync(machineName, port, rpath, rpathDir, *verbose) // initial sync

if *watch {

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This if statement is the only differing part. I also was not pleased to duplicate whole main.go - Maybe there could be a small wrapper around the actual (darwin) watch.go, which imitates fsnotify.v1 signature?

fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(machineName, port, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

}

}
4 changes: 2 additions & 2 deletions rsync.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@ func Sync(via string, port uint, src, dst string, verbose bool) {

command := "rsync " + strings.Join(args, " ")

// fmt.Println("/bin/sh", "-c", command)
cmd := exec.Command("/bin/sh", "-c", command)
// fmt.Println("sh", "-c", command)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this dependency on sh? Or replace it by a corresponding multiplattfrom go library?

cmd := exec.Command("sh", "-c", command)

if verbose {
cmd.Stdout = os.Stdout
Expand Down
2 changes: 2 additions & 0 deletions watch.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Force GitHub README to respect dark mode (function() { var style = document.createElement('style'); style.textContent = ' .markdown-body { color-scheme: dark light; } .markdown-body pre { background: #161b22 !important; } .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; } .markdown-body table th, .markdown-body table td { border-color: #30363d !important; } .markdown-body img { background: #0d1117; } .markdown-body blockquote { border-left-color: #8b949e; } .markdown-body hr { border-color: #30363d; } '; document.head.appendChild(style); })(); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' WIP (windows support): stub for supporting windows via fsnotify.v1 by blaggacao · Pull Request #6 · synack/docker-rsync · GitHub
Skip to content
This repository was archived by the owner on May 28, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dockermachine.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ func RunSSHCommand(machineName, command string, verbose bool) (out []byte, err e
if verbose {
fmt.Println(`docker-machine ssh ` + machineName + ` '` + command + `'`)
}
return exec.Command("/bin/sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
return exec.Command("sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
}

func GetSSHPort(machineName string) (port uint, err error) {
out, err := exec.Command("/bin/sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
out, err := exec.Command("sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
if err != nil {
return 0, err
}
Expand Down
2 changes: 2 additions & 0 deletions main.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
166 changes: 166 additions & 0 deletions main_windows.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
// +build windows

package main

import (
"flag"
"fmt"
"gopkg.in/fsnotify.v1"
"log"
"os"
pathpkg "path"
"strings"
)

func main() {
pwd, err := os.Getwd()
if err != nil {
fmt.Println("error: unable to get current directory:", err)
os.Exit(1)
}

flag.Usage = func() {
fmt.Fprintf(os.Stderr, "usage: %v [options] DOCKER-MACHINE-NAME\n", os.Args[0])
fmt.Fprintf(os.Stderr, " or: %v [options] rsync://IP:PORT/MODULE\n", os.Args[0])
fmt.Print("\nOptions:\n")
flag.PrintDefaults()
}

var version = flag.Bool("version", false, "Print version")
var watch = flag.Bool("watch", true, "Watch source directory for changes")
var verbose = flag.Bool("verbose", false, "Verbose output")
var srcpath = flag.String("src", pwd, "Source directory")
var dstpath = flag.String("dst", pathpkg.Join("/rsync", pwd), "Destination directory")

flag.Parse()

if *version {
fmt.Println(Version)
os.Exit(0)
}

if len(flag.Args()) != 1 {
flag.Usage()
os.Exit(1)
}

via := flag.Args()[0]

if *srcpath == "" {
fmt.Println("error: please specify -src argument")
os.Exit(1)
}

if *dstpath == "" {
fmt.Println("error: please specify -dst argument")
os.Exit(1)
}

rpath := *srcpath
rpathDir := pathpkg.Dir(*dstpath)

// TODO: refactor the following part...

if strings.HasPrefix(via, "rsync://") {
// use rsync protocol directly
rsyncEndpoint := via

fmt.Printf("Syncing %s (local) to %s (%s)\n", *srcpath, *dstpath, rsyncEndpoint)
Sync(rsyncEndpoint, 0, rpath, rpathDir, *verbose) // initial sync

if *watch {
fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

} else {
// use rsync via ssh
machineName := via

port, err := GetSSHPort(machineName)
if err != nil {
fmt.Printf("error: unable to get port for machine '%v': %v\n", machineName, err)
os.Exit(1)
}

Provision(machineName, *verbose)
RunSSHCommand(machineName, "sudo mkdir -p "+rpathDir, *verbose)
fmt.Printf("Syncing %s (local) to %s (docker-machine %s)\n", *srcpath, *dstpath, machineName)
Sync(machineName, port, rpath, rpathDir, *verbose) // initial sync

if *watch {

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This if statement is the only differing part. I also was not pleased to duplicate whole main.go - Maybe there could be a small wrapper around the actual (darwin) watch.go, which imitates fsnotify.v1 signature?

fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(machineName, port, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

}

}
4 changes: 2 additions & 2 deletions rsync.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@ func Sync(via string, port uint, src, dst string, verbose bool) {

command := "rsync " + strings.Join(args, " ")

// fmt.Println("/bin/sh", "-c", command)
cmd := exec.Command("/bin/sh", "-c", command)
// fmt.Println("sh", "-c", command)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this dependency on sh? Or replace it by a corresponding multiplattfrom go library?

cmd := exec.Command("sh", "-c", command)

if verbose {
cmd.Stdout = os.Stdout
Expand Down
2 changes: 2 additions & 0 deletions watch.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Highlight search terms from Google/DuckDuckGo/Bing referrer (function() { var ref = document.referrer; var terms = []; if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) { var url = new URL(ref); var q = url.searchParams.get('q') || url.searchParams.get('p'); if (q) { terms = q.split(/\s+/).filter(function(t) { return t.length > 2; }); } } if (terms.length === 0) return; var style = document.createElement('style'); style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }'; document.head.appendChild(style); function highlight(node) { if (node.nodeType === 3) { // text node var text = node.textContent; var found = false; terms.forEach(function(term) { var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi'); if (regex.test(text)) { found = true; var frag = document.createDocumentFragment(); var parts = text.split(regex); parts.forEach(function(part, i) { if (i % 2 === 0) { frag.appendChild(document.createTextNode(part)); } else { var span = document.createElement('span'); span.className = 'userscript-highlight'; span.textContent = part; frag.appendChild(span); } }); node.parentNode.replaceChild(frag, node); } }); } else if (node.nodeType === 1 && node.childNodes) { // element var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT']; if (!skipTags.includes(node.tagName)) { Array.from(node.childNodes).forEach(highlight); } } } highlight(document.body); // Re-highlight on dynamic content var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1 || node.nodeType === 3) highlight(node); }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' WIP (windows support): stub for supporting windows via fsnotify.v1 by blaggacao · Pull Request #6 · synack/docker-rsync · GitHub
Skip to content
This repository was archived by the owner on May 28, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dockermachine.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ func RunSSHCommand(machineName, command string, verbose bool) (out []byte, err e
if verbose {
fmt.Println(`docker-machine ssh ` + machineName + ` '` + command + `'`)
}
return exec.Command("/bin/sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
return exec.Command("sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
}

func GetSSHPort(machineName string) (port uint, err error) {
out, err := exec.Command("/bin/sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
out, err := exec.Command("sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
if err != nil {
return 0, err
}
Expand Down
2 changes: 2 additions & 0 deletions main.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
166 changes: 166 additions & 0 deletions main_windows.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
// +build windows

package main

import (
"flag"
"fmt"
"gopkg.in/fsnotify.v1"
"log"
"os"
pathpkg "path"
"strings"
)

func main() {
pwd, err := os.Getwd()
if err != nil {
fmt.Println("error: unable to get current directory:", err)
os.Exit(1)
}

flag.Usage = func() {
fmt.Fprintf(os.Stderr, "usage: %v [options] DOCKER-MACHINE-NAME\n", os.Args[0])
fmt.Fprintf(os.Stderr, " or: %v [options] rsync://IP:PORT/MODULE\n", os.Args[0])
fmt.Print("\nOptions:\n")
flag.PrintDefaults()
}

var version = flag.Bool("version", false, "Print version")
var watch = flag.Bool("watch", true, "Watch source directory for changes")
var verbose = flag.Bool("verbose", false, "Verbose output")
var srcpath = flag.String("src", pwd, "Source directory")
var dstpath = flag.String("dst", pathpkg.Join("/rsync", pwd), "Destination directory")

flag.Parse()

if *version {
fmt.Println(Version)
os.Exit(0)
}

if len(flag.Args()) != 1 {
flag.Usage()
os.Exit(1)
}

via := flag.Args()[0]

if *srcpath == "" {
fmt.Println("error: please specify -src argument")
os.Exit(1)
}

if *dstpath == "" {
fmt.Println("error: please specify -dst argument")
os.Exit(1)
}

rpath := *srcpath
rpathDir := pathpkg.Dir(*dstpath)

// TODO: refactor the following part...

if strings.HasPrefix(via, "rsync://") {
// use rsync protocol directly
rsyncEndpoint := via

fmt.Printf("Syncing %s (local) to %s (%s)\n", *srcpath, *dstpath, rsyncEndpoint)
Sync(rsyncEndpoint, 0, rpath, rpathDir, *verbose) // initial sync

if *watch {
fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

} else {
// use rsync via ssh
machineName := via

port, err := GetSSHPort(machineName)
if err != nil {
fmt.Printf("error: unable to get port for machine '%v': %v\n", machineName, err)
os.Exit(1)
}

Provision(machineName, *verbose)
RunSSHCommand(machineName, "sudo mkdir -p "+rpathDir, *verbose)
fmt.Printf("Syncing %s (local) to %s (docker-machine %s)\n", *srcpath, *dstpath, machineName)
Sync(machineName, port, rpath, rpathDir, *verbose) // initial sync

if *watch {

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This if statement is the only differing part. I also was not pleased to duplicate whole main.go - Maybe there could be a small wrapper around the actual (darwin) watch.go, which imitates fsnotify.v1 signature?

fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(machineName, port, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

}

}
4 changes: 2 additions & 2 deletions rsync.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@ func Sync(via string, port uint, src, dst string, verbose bool) {

command := "rsync " + strings.Join(args, " ")

// fmt.Println("/bin/sh", "-c", command)
cmd := exec.Command("/bin/sh", "-c", command)
// fmt.Println("sh", "-c", command)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this dependency on sh? Or replace it by a corresponding multiplattfrom go library?

cmd := exec.Command("sh", "-c", command)

if verbose {
cmd.Stdout = os.Stdout
Expand Down
2 changes: 2 additions & 0 deletions watch.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Strip utm_, fbclid, gclid, etc. from all links on page (function() { var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content', 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid', 'ref', 'ref_src', 'source', 'medium', 'campaign']; function cleanUrl(url) { try { var u = new URL(url, window.location.origin); var changed = false; trackingParams.forEach(function(p) { if (u.searchParams.has(p)) { u.searchParams.delete(p); changed = true; } }); return changed ? u.toString() : url; } catch (e) { return url; } } function cleanLinks() { document.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } cleanLinks(); var observer = new MutationObserver(function(mutations) { mutations.forEach(function(m) { m.addedNodes.forEach(function(node) { if (node.nodeType === 1) { if (node.tagName === 'A') cleanLinks(); node.querySelectorAll('a[href]').forEach(function(a) { var clean = cleanUrl(a.href); if (clean !== a.href) a.href = clean; }); } }); }); }); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + ' WIP (windows support): stub for supporting windows via fsnotify.v1 by blaggacao · Pull Request #6 · synack/docker-rsync · GitHub
Skip to content
This repository was archived by the owner on May 28, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dockermachine.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ func RunSSHCommand(machineName, command string, verbose bool) (out []byte, err e
if verbose {
fmt.Println(`docker-machine ssh ` + machineName + ` '` + command + `'`)
}
return exec.Command("/bin/sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
return exec.Command("sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
}

func GetSSHPort(machineName string) (port uint, err error) {
out, err := exec.Command("/bin/sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
out, err := exec.Command("sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
if err != nil {
return 0, err
}
Expand Down
2 changes: 2 additions & 0 deletions main.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
166 changes: 166 additions & 0 deletions main_windows.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
// +build windows

package main

import (
"flag"
"fmt"
"gopkg.in/fsnotify.v1"
"log"
"os"
pathpkg "path"
"strings"
)

func main() {
pwd, err := os.Getwd()
if err != nil {
fmt.Println("error: unable to get current directory:", err)
os.Exit(1)
}

flag.Usage = func() {
fmt.Fprintf(os.Stderr, "usage: %v [options] DOCKER-MACHINE-NAME\n", os.Args[0])
fmt.Fprintf(os.Stderr, " or: %v [options] rsync://IP:PORT/MODULE\n", os.Args[0])
fmt.Print("\nOptions:\n")
flag.PrintDefaults()
}

var version = flag.Bool("version", false, "Print version")
var watch = flag.Bool("watch", true, "Watch source directory for changes")
var verbose = flag.Bool("verbose", false, "Verbose output")
var srcpath = flag.String("src", pwd, "Source directory")
var dstpath = flag.String("dst", pathpkg.Join("/rsync", pwd), "Destination directory")

flag.Parse()

if *version {
fmt.Println(Version)
os.Exit(0)
}

if len(flag.Args()) != 1 {
flag.Usage()
os.Exit(1)
}

via := flag.Args()[0]

if *srcpath == "" {
fmt.Println("error: please specify -src argument")
os.Exit(1)
}

if *dstpath == "" {
fmt.Println("error: please specify -dst argument")
os.Exit(1)
}

rpath := *srcpath
rpathDir := pathpkg.Dir(*dstpath)

// TODO: refactor the following part...

if strings.HasPrefix(via, "rsync://") {
// use rsync protocol directly
rsyncEndpoint := via

fmt.Printf("Syncing %s (local) to %s (%s)\n", *srcpath, *dstpath, rsyncEndpoint)
Sync(rsyncEndpoint, 0, rpath, rpathDir, *verbose) // initial sync

if *watch {
fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

} else {
// use rsync via ssh
machineName := via

port, err := GetSSHPort(machineName)
if err != nil {
fmt.Printf("error: unable to get port for machine '%v': %v\n", machineName, err)
os.Exit(1)
}

Provision(machineName, *verbose)
RunSSHCommand(machineName, "sudo mkdir -p "+rpathDir, *verbose)
fmt.Printf("Syncing %s (local) to %s (docker-machine %s)\n", *srcpath, *dstpath, machineName)
Sync(machineName, port, rpath, rpathDir, *verbose) // initial sync

if *watch {

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This if statement is the only differing part. I also was not pleased to duplicate whole main.go - Maybe there could be a small wrapper around the actual (darwin) watch.go, which imitates fsnotify.v1 signature?

fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(machineName, port, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

}

}
4 changes: 2 additions & 2 deletions rsync.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@ func Sync(via string, port uint, src, dst string, verbose bool) {

command := "rsync " + strings.Join(args, " ")

// fmt.Println("/bin/sh", "-c", command)
cmd := exec.Command("/bin/sh", "-c", command)
// fmt.Println("sh", "-c", command)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this dependency on sh? Or replace it by a corresponding multiplattfrom go library?

cmd := exec.Command("sh", "-c", command)

if verbose {
cmd.Stdout = os.Stdout
Expand Down
2 changes: 2 additions & 0 deletions watch.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Auto-enable theater mode on YouTube (function() { function tryTheater() { var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]'); if (btn && !btn.classList.contains('activated')) { btn.click(); } } // Try immediately tryTheater(); // Try after navigation (SPA) var lastUrl = location.href; setInterval(function() { if (location.href !== lastUrl) { lastUrl = location.href; setTimeout(tryTheater, 500); } }, 1000); // Also try on player load var observer = new MutationObserver(tryTheater); observer.observe(document.body, { childList: true, subtree: true }); })(); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' WIP (windows support): stub for supporting windows via fsnotify.v1 by blaggacao · Pull Request #6 · synack/docker-rsync · GitHub
Skip to content
This repository was archived by the owner on May 28, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dockermachine.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ func RunSSHCommand(machineName, command string, verbose bool) (out []byte, err e
if verbose {
fmt.Println(`docker-machine ssh ` + machineName + ` '` + command + `'`)
}
return exec.Command("/bin/sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
return exec.Command("sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
}

func GetSSHPort(machineName string) (port uint, err error) {
out, err := exec.Command("/bin/sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
out, err := exec.Command("sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
if err != nil {
return 0, err
}
Expand Down
2 changes: 2 additions & 0 deletions main.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
166 changes: 166 additions & 0 deletions main_windows.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
// +build windows

package main

import (
"flag"
"fmt"
"gopkg.in/fsnotify.v1"
"log"
"os"
pathpkg "path"
"strings"
)

func main() {
pwd, err := os.Getwd()
if err != nil {
fmt.Println("error: unable to get current directory:", err)
os.Exit(1)
}

flag.Usage = func() {
fmt.Fprintf(os.Stderr, "usage: %v [options] DOCKER-MACHINE-NAME\n", os.Args[0])
fmt.Fprintf(os.Stderr, " or: %v [options] rsync://IP:PORT/MODULE\n", os.Args[0])
fmt.Print("\nOptions:\n")
flag.PrintDefaults()
}

var version = flag.Bool("version", false, "Print version")
var watch = flag.Bool("watch", true, "Watch source directory for changes")
var verbose = flag.Bool("verbose", false, "Verbose output")
var srcpath = flag.String("src", pwd, "Source directory")
var dstpath = flag.String("dst", pathpkg.Join("/rsync", pwd), "Destination directory")

flag.Parse()

if *version {
fmt.Println(Version)
os.Exit(0)
}

if len(flag.Args()) != 1 {
flag.Usage()
os.Exit(1)
}

via := flag.Args()[0]

if *srcpath == "" {
fmt.Println("error: please specify -src argument")
os.Exit(1)
}

if *dstpath == "" {
fmt.Println("error: please specify -dst argument")
os.Exit(1)
}

rpath := *srcpath
rpathDir := pathpkg.Dir(*dstpath)

// TODO: refactor the following part...

if strings.HasPrefix(via, "rsync://") {
// use rsync protocol directly
rsyncEndpoint := via

fmt.Printf("Syncing %s (local) to %s (%s)\n", *srcpath, *dstpath, rsyncEndpoint)
Sync(rsyncEndpoint, 0, rpath, rpathDir, *verbose) // initial sync

if *watch {
fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

} else {
// use rsync via ssh
machineName := via

port, err := GetSSHPort(machineName)
if err != nil {
fmt.Printf("error: unable to get port for machine '%v': %v\n", machineName, err)
os.Exit(1)
}

Provision(machineName, *verbose)
RunSSHCommand(machineName, "sudo mkdir -p "+rpathDir, *verbose)
fmt.Printf("Syncing %s (local) to %s (docker-machine %s)\n", *srcpath, *dstpath, machineName)
Sync(machineName, port, rpath, rpathDir, *verbose) // initial sync

if *watch {

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This if statement is the only differing part. I also was not pleased to duplicate whole main.go - Maybe there could be a small wrapper around the actual (darwin) watch.go, which imitates fsnotify.v1 signature?

fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(machineName, port, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

}

}
4 changes: 2 additions & 2 deletions rsync.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@ func Sync(via string, port uint, src, dst string, verbose bool) {

command := "rsync " + strings.Join(args, " ")

// fmt.Println("/bin/sh", "-c", command)
cmd := exec.Command("/bin/sh", "-c", command)
// fmt.Println("sh", "-c", command)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this dependency on sh? Or replace it by a corresponding multiplattfrom go library?

cmd := exec.Command("sh", "-c", command)

if verbose {
cmd.Stdout = os.Stdout
Expand Down
2 changes: 2 additions & 0 deletions watch.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Remove or un-stick sticky/fixed headers that block content (function() { function unstick() { document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) { if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') { el.style.position = 'static'; el.style.top = 'auto'; el.style.zIndex = 'auto'; } }); } unstick(); var observer = new MutationObserver(unstick); observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] }); })(); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + ' WIP (windows support): stub for supporting windows via fsnotify.v1 by blaggacao · Pull Request #6 · synack/docker-rsync · GitHub
Skip to content
This repository was archived by the owner on May 28, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dockermachine.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ func RunSSHCommand(machineName, command string, verbose bool) (out []byte, err e
if verbose {
fmt.Println(`docker-machine ssh ` + machineName + ` '` + command + `'`)
}
return exec.Command("/bin/sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
return exec.Command("sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
}

func GetSSHPort(machineName string) (port uint, err error) {
out, err := exec.Command("/bin/sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
out, err := exec.Command("sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
if err != nil {
return 0, err
}
Expand Down
2 changes: 2 additions & 0 deletions main.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
166 changes: 166 additions & 0 deletions main_windows.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
// +build windows

package main

import (
"flag"
"fmt"
"gopkg.in/fsnotify.v1"
"log"
"os"
pathpkg "path"
"strings"
)

func main() {
pwd, err := os.Getwd()
if err != nil {
fmt.Println("error: unable to get current directory:", err)
os.Exit(1)
}

flag.Usage = func() {
fmt.Fprintf(os.Stderr, "usage: %v [options] DOCKER-MACHINE-NAME\n", os.Args[0])
fmt.Fprintf(os.Stderr, " or: %v [options] rsync://IP:PORT/MODULE\n", os.Args[0])
fmt.Print("\nOptions:\n")
flag.PrintDefaults()
}

var version = flag.Bool("version", false, "Print version")
var watch = flag.Bool("watch", true, "Watch source directory for changes")
var verbose = flag.Bool("verbose", false, "Verbose output")
var srcpath = flag.String("src", pwd, "Source directory")
var dstpath = flag.String("dst", pathpkg.Join("/rsync", pwd), "Destination directory")

flag.Parse()

if *version {
fmt.Println(Version)
os.Exit(0)
}

if len(flag.Args()) != 1 {
flag.Usage()
os.Exit(1)
}

via := flag.Args()[0]

if *srcpath == "" {
fmt.Println("error: please specify -src argument")
os.Exit(1)
}

if *dstpath == "" {
fmt.Println("error: please specify -dst argument")
os.Exit(1)
}

rpath := *srcpath
rpathDir := pathpkg.Dir(*dstpath)

// TODO: refactor the following part...

if strings.HasPrefix(via, "rsync://") {
// use rsync protocol directly
rsyncEndpoint := via

fmt.Printf("Syncing %s (local) to %s (%s)\n", *srcpath, *dstpath, rsyncEndpoint)
Sync(rsyncEndpoint, 0, rpath, rpathDir, *verbose) // initial sync

if *watch {
fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

} else {
// use rsync via ssh
machineName := via

port, err := GetSSHPort(machineName)
if err != nil {
fmt.Printf("error: unable to get port for machine '%v': %v\n", machineName, err)
os.Exit(1)
}

Provision(machineName, *verbose)
RunSSHCommand(machineName, "sudo mkdir -p "+rpathDir, *verbose)
fmt.Printf("Syncing %s (local) to %s (docker-machine %s)\n", *srcpath, *dstpath, machineName)
Sync(machineName, port, rpath, rpathDir, *verbose) // initial sync

if *watch {

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This if statement is the only differing part. I also was not pleased to duplicate whole main.go - Maybe there could be a small wrapper around the actual (darwin) watch.go, which imitates fsnotify.v1 signature?

fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(machineName, port, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

}

}
4 changes: 2 additions & 2 deletions rsync.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@ func Sync(via string, port uint, src, dst string, verbose bool) {

command := "rsync " + strings.Join(args, " ")

// fmt.Println("/bin/sh", "-c", command)
cmd := exec.Command("/bin/sh", "-c", command)
// fmt.Println("sh", "-c", command)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this dependency on sh? Or replace it by a corresponding multiplattfrom go library?

cmd := exec.Command("sh", "-c", command)

if verbose {
cmd.Stdout = os.Stdout
Expand Down
2 changes: 2 additions & 0 deletions watch.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Universal Dark Mode - works on any site (function() { var enabled = true; function applyDarkMode() { if (!enabled) return; // Create style element if it doesn't exist var style = document.getElementById('universal-dark-mode-style'); if (!style) { style = document.createElement('style'); style.id = 'universal-dark-mode-style'; document.head.appendChild(style); } // Dark mode CSS - inverts colors but preserves images/video style.textContent = ' /* Invert everything except media */ html { filter: invert(1) hue-rotate(180deg) !important; background: #1a1a2e !important; } /* Restore images, videos, iframes, canvas */ img, video, iframe, canvas, svg, picture, [style*="background-image"] { filter: invert(1) hue-rotate(180deg) !important; } /* Preserve specific elements that should not be inverted */ .no-dark-mode, .no-dark-mode *, [data-theme="light"], [data-theme="light"], .ace_editor, .ace_editor *, .CodeMirror, .CodeMirror *, .monaco-editor, .monaco-editor *, .markdown-body pre, .markdown-body pre *, .highlight, .highlight *, pre code, pre code * { filter: none !important; } /* Fix common UI elements */ .modal, .popup, .dropdown-menu, .tooltip, .popover { filter: invert(1) hue-rotate(180deg) !important; background: #2d2d44 !important; border-color: #444 !important; } /* Scrollbars */ ::-webkit-scrollbar { background: #1a1a2e !important; } ::-webkit-scrollbar-thumb { background: #444 !important; } ::-webkit-scrollbar-thumb:hover { background: #555 !important; } /* Selection */ ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; } ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; } '; } function removeDarkMode() { var style = document.getElementById('universal-dark-mode-style'); if (style) style.remove(); } // Toggle with Alt+Shift+D document.addEventListener('keydown', function(e) { if (e.altKey && e.shiftKey && e.key === 'D') { e.preventDefault(); enabled = !enabled; if (enabled) { applyDarkMode(); console.log('[Universal Dark Mode] Enabled'); } else { removeDarkMode(); console.log('[Universal Dark Mode] Disabled'); } } }); // Apply on load applyDarkMode(); // Re-apply on dynamic content var observer = new MutationObserver(function(mutations) { if (enabled && !document.getElementById('universal-dark-mode-style')) { applyDarkMode(); } }); observer.observe(document.head, { childList: true }); console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle'); })(); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })(); WIP (windows support): stub for supporting windows via fsnotify.v1 by blaggacao · Pull Request #6 · synack/docker-rsync · GitHub
Skip to content
This repository was archived by the owner on May 28, 2023. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions dockermachine.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -31,11 +31,11 @@ func RunSSHCommand(machineName, command string, verbose bool) (out []byte, err e
if verbose {
fmt.Println(`docker-machine ssh ` + machineName + ` '` + command + `'`)
}
return exec.Command("/bin/sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
return exec.Command("sh", "-c", `docker-machine ssh `+machineName+` '`+command+`'`).CombinedOutput()
}

func GetSSHPort(machineName string) (port uint, err error) {
out, err := exec.Command("/bin/sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
out, err := exec.Command("sh", "-c", `docker-machine inspect `+machineName).CombinedOutput()
if err != nil {
return 0, err
}
Expand Down
2 changes: 2 additions & 0 deletions main.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down
166 changes: 166 additions & 0 deletions main_windows.go
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,166 @@
// +build windows

package main

import (
"flag"
"fmt"
"gopkg.in/fsnotify.v1"
"log"
"os"
pathpkg "path"
"strings"
)

func main() {
pwd, err := os.Getwd()
if err != nil {
fmt.Println("error: unable to get current directory:", err)
os.Exit(1)
}

flag.Usage = func() {
fmt.Fprintf(os.Stderr, "usage: %v [options] DOCKER-MACHINE-NAME\n", os.Args[0])
fmt.Fprintf(os.Stderr, " or: %v [options] rsync://IP:PORT/MODULE\n", os.Args[0])
fmt.Print("\nOptions:\n")
flag.PrintDefaults()
}

var version = flag.Bool("version", false, "Print version")
var watch = flag.Bool("watch", true, "Watch source directory for changes")
var verbose = flag.Bool("verbose", false, "Verbose output")
var srcpath = flag.String("src", pwd, "Source directory")
var dstpath = flag.String("dst", pathpkg.Join("/rsync", pwd), "Destination directory")

flag.Parse()

if *version {
fmt.Println(Version)
os.Exit(0)
}

if len(flag.Args()) != 1 {
flag.Usage()
os.Exit(1)
}

via := flag.Args()[0]

if *srcpath == "" {
fmt.Println("error: please specify -src argument")
os.Exit(1)
}

if *dstpath == "" {
fmt.Println("error: please specify -dst argument")
os.Exit(1)
}

rpath := *srcpath
rpathDir := pathpkg.Dir(*dstpath)

// TODO: refactor the following part...

if strings.HasPrefix(via, "rsync://") {
// use rsync protocol directly
rsyncEndpoint := via

fmt.Printf("Syncing %s (local) to %s (%s)\n", *srcpath, *dstpath, rsyncEndpoint)
Sync(rsyncEndpoint, 0, rpath, rpathDir, *verbose) // initial sync

if *watch {
fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(rsyncEndpoint, 0, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

} else {
// use rsync via ssh
machineName := via

port, err := GetSSHPort(machineName)
if err != nil {
fmt.Printf("error: unable to get port for machine '%v': %v\n", machineName, err)
os.Exit(1)
}

Provision(machineName, *verbose)
RunSSHCommand(machineName, "sudo mkdir -p "+rpathDir, *verbose)
fmt.Printf("Syncing %s (local) to %s (docker-machine %s)\n", *srcpath, *dstpath, machineName)
Sync(machineName, port, rpath, rpathDir, *verbose) // initial sync

if *watch {

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This if statement is the only differing part. I also was not pleased to duplicate whole main.go - Maybe there could be a small wrapper around the actual (darwin) watch.go, which imitates fsnotify.v1 signature?

fmt.Println("Watching for file changes ...")
watcher, err := fsnotify.NewWatcher()
if err != nil {
log.Fatal(err)
}
defer watcher.Close()

done := make(chan bool)
go func() {
for {
select {
case event := <-watcher.Events:
log.Println("event:", event)
if event.Op&fsnotify.Create == fsnotify.Create {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Write == fsnotify.Write {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Remove == fsnotify.Remove {
Sync(machineName, port, rpath, rpathDir, true)
}
if event.Op&fsnotify.Rename == fsnotify.Rename {
Sync(machineName, port, rpath, rpathDir, true)
}
case err := <-watcher.Errors:
log.Println("error:", err)
}
}
}()

err = watcher.Add("/tmp/foo")
if err != nil {
log.Fatal(err)
}
<-done
}

}

}
4 changes: 2 additions & 2 deletions rsync.go
Original file line numberDiff line numberDiff line change
Expand Up@@ -43,8 +43,8 @@ func Sync(via string, port uint, src, dst string, verbose bool) {

command := "rsync " + strings.Join(args, " ")

// fmt.Println("/bin/sh", "-c", command)
cmd := exec.Command("/bin/sh", "-c", command)
// fmt.Println("sh", "-c", command)

Copy link
Copy Markdown
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we remove this dependency on sh? Or replace it by a corresponding multiplattfrom go library?

cmd := exec.Command("sh", "-c", command)

if verbose {
cmd.Stdout = os.Stdout
Expand Down
2 changes: 2 additions & 0 deletions watch.go
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
// +build darwin

package main

import (
Expand Down