Merge pull request #1465 from breml/linting-issues

chore: code structure, Go identifier shaddowing

Author: stgraber

internal/server/db/schema/query.go

@@ -73,11 +73,11 @@ CREATE TABLE schema (
 }
 
 // Insert a new version into the schema table.
-func insertSchemaVersion(tx *sql.Tx, new int) error {
+func insertSchemaVersion(tx *sql.Tx, newVersion int) error {
 	statement := `
 INSERT INTO schema (version, updated_at) VALUES (?, strftime("%s"))
 `
-	_, err := tx.Exec(statement, new)
+	_, err := tx.Exec(statement, newVersion)
 	return err
 }
 

internal/util/filesystem.go

@@ -72,12 +72,12 @@ func FileCopy(source string, dest string) error {
 
 	d, err := os.Create(dest)
 	if err != nil {
-		if os.IsExist(err) {
-			d, err = os.OpenFile(dest, os.O_WRONLY, fi.Mode())
-			if err != nil {
-				return err
-			}
-		} else {
+		if !os.IsExist(err) {
+			return err
+		}
+
+		d, err = os.OpenFile(dest, os.O_WRONLY, fi.Mode())
+		if err != nil {
 			return err
 		}
 	}