Kaynağa Gözat

Merge pull request #63 from altin/master

Update how the home directory path is returned
Rich Infante 4 yıl önce
ebeveyn
işleme
e3c9452879
3 değiştirilmiş dosya ile 7 ekleme ve 4 silme
  1. 2 1
      tools/backup.js
  2. 2 1
      tools/index.js
  3. 3 2
      tools/util/iphone_backup.js

+ 2 - 1
tools/backup.js

@@ -4,6 +4,7 @@ const path = require('path')
 const log = require('./util/log')
 const filehash = require('./util/backup_filehash')
 const manifestMBDBParse = require('./util/manifest_mbdb_parse')
+const os = require('os')
 
 /**
  * Backup3 is the version 4 of the backup library.
@@ -33,7 +34,7 @@ class Backup {
     if (base) {
       this.path = path.join(base, id)
     } else {
-      this.path = path.join(process.env.HOME, '/Library/Application Support/MobileSync/Backup/', id)
+      this.path = path.join(os.homedir(), '/Library/Application Support/MobileSync/Backup/', id)
     }
   }
 

+ 2 - 1
tools/index.js

@@ -4,9 +4,10 @@ const report = require('./reports')
 const matcher = require('./util/matcher')
 const Group = report.Group
 const Backup = require('./backup')
+const os = require('os')
 
 // Backup source directory
-var backupDirectory = path.join(process.env.HOME, '/Library/Application Support/MobileSync/Backup/')
+var backupDirectory = path.join(os.homedir(), '/Library/Application Support/MobileSync/Backup/')
 
 // Object containing all report modules
 var moduleCache = report.types

+ 3 - 2
tools/util/iphone_backup.js

@@ -3,6 +3,7 @@ const path = require('path')
 const sqlite3 = require('sqlite3')
 const fs = require('fs')
 const plist = require('./plist')
+const os = require('os')
 
 // Cookie Parser
 const cookieParser = require('./cookies.js')
@@ -61,7 +62,7 @@ class IPhoneBackup {
     if (base) {
       base = path.join(base, id)
     } else {
-      base = path.join(process.env.HOME, '/Library/Application Support/MobileSync/Backup/', id)
+      base = path.join(os.homedir(), '/Library/Application Support/MobileSync/Backup/', id)
     }
 
     // Parse manifest plist files
@@ -852,7 +853,7 @@ class IPhoneBackup {
 }
 
 module.exports.availableBackups = function () {
-  const base = path.join(process.env.HOME, '/Library/Application Support/MobileSync/Backup/')
+  const base = path.join(os.homedir(), '/Library/Application Support/MobileSync/Backup/')
   return new Promise((resolve, reject) => {
     resolve(fs.readdirSync(base, {
       encoding: 'utf8'