rename whitespace in files too

README.md

@@ -1 +1,15 @@
 WPS Office Installer for openSUSE
+
+------
+
+Installation:
+
+    go build wps-installer.go
+    go build ghost_generator.go
+    go build depends_generator.go
+
+wps-installer will be installed to /var/adm/update-scripts.
+
+`ghost_generator -wpsdir` will generate directories and ghost files files used by specfile.
+
+`depends_generator -wpsdir` will generate wps-office's runtime dependencies used in specfile.

ghost_generator.go

@@ -4,6 +4,7 @@ import (
 	"flag"
 	"log"
 	"os"
+	"path"
 	"path/filepath"
 	"regexp"
 	"sort"
@@ -49,11 +50,22 @@ func renameWhitespaceInDir(dir string) {
 
 	for _, p := range dirs {
 		if re.MatchString(p) {
-			os.Rename(p, strings.Replace(p, " ", "_", -1))
+			os.Rename(p, path.Dir(p)+"/"+strings.Replace(filepath.Base(p), " ", "_", -1))
 		}
 	}
 }
 
+func renameWhitespaceInFiles(dir string) {
+	re := regexp.MustCompile(`[[:space:]]`)
+	err := filepath.Walk(dir, func(p string, i os.FileInfo, e error) error {
+		if !i.IsDir() && re.MatchString(p) {
+			os.Rename(p, strings.Replace(p, " ", "_", -1))
+		}
+		return nil
+	})
+	checkError(err)
+}
+
 func getDirsAndFiles(dir string) ([]string, []string) {
 	var dirs []string
 	var files []string
@@ -99,15 +111,16 @@ func main() {
 	var wpsDir string
 	flag.StringVar(&wpsDir, "wpsdir", "", "wps office directory")
 	flag.Parse()
-        if wpsDir == "" {
-                panic("You must specify the unpacked wps office dir with -wpsdir")
-        }
+	if wpsDir == "" {
+		panic("You must specify the unpacked wps office dir with -wpsdir")
+	}
 
-        log.Println("wpsDir: " + wpsDir)
+	log.Println("wpsDir: " + wpsDir)
 
 	office6Dir := wpsDir + "/office6"
 	fontsDir := wpsDir + "/fonts"
 	renameWhitespaceInDir(office6Dir)
+	renameWhitespaceInFiles(office6Dir)
 	officeDirs, officeFiles := getDirsAndFiles(office6Dir)
 	_, fontFiles := getDirsAndFiles(fontsDir)
 

wps-installer.go

@@ -156,11 +156,22 @@ func renameWhitespaceInDir(dir string) {
 
 	for _, p := range dirs {
 		if re.MatchString(p) {
-			os.Rename(p, strings.Replace(p, " ", "_", -1))
+			os.Rename(p, path.Dir(p)+"/"+strings.Replace(filepath.Base(p), " ", "_", -1))
 		}
 	}
 }
 
+func renameWhitespaceInFiles(dir string) {
+	re := regexp.MustCompile(`[[:space:]]`)
+	err := filepath.Walk(dir, func(p string, i os.FileInfo, e error) error {
+		if !i.IsDir() && re.MatchString(p) {
+			os.Rename(p, strings.Replace(p, " ", "_", -1))
+		}
+		return nil
+	})
+	checkError(err)
+}
+
 func absolutePath(relativePath, parentDir string) string {
 	if strings.HasPrefix(relativePath, "/") {
 		return filepath.Clean(relativePath)
@@ -339,6 +350,7 @@ func main() {
 	unpack(wpsTmp+wpsTar, wpsPrefix)
 	createDir(wpsDestDir)
 	renameWhitespaceInDir(wpsPrefix)
+	renameWhitespaceInFiles(wpsPrefix)
 
 	log.Println("Copying files...Ultra slow...")
 	copyDir(wpsPrefix+"/office6", wpsDestDir+"/office6")